]> git.mxchange.org Git - friendica.git/blobdiff - mod/follow.php
Merge pull request #4579 from annando/fix-diaspora-link
[friendica.git] / mod / follow.php
index 2b564c1bfa2a8b0342ddc6eff9fe5c560d13fa7a..bb9bc0eb3b3ca80aefabcd2b58b3578146c1aa96 100644 (file)
@@ -1,14 +1,56 @@
 <?php
+/**
+ * @file mod/follow.php
+ */
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
+use Friendica\Network\Probe;
 
-require_once('include/Scrape.php');
-require_once('include/follow.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
+function follow_post(App $a) {
+
+       if (!local_user()) {
+               notice(L10n::t('Permission denied.') . EOL);
+               goaway($_SESSION['return_url']);
+               // NOTREACHED
+       }
+
+       if ($_REQUEST['cancel']) {
+               goaway($_SESSION['return_url']);
+       }
+
+       $uid = local_user();
+       $url = notags(trim($_REQUEST['url']));
+       $return_url = $_SESSION['return_url'];
+
+       // Makes the connection request for friendica contacts easier
+       // This is just a precaution if maybe this page is called somewhere directly via POST
+       $_SESSION["fastlane"] = $url;
+
+       $result = Contact::createFromProbe($uid, $url, true);
+
+       if ($result['success'] == false) {
+               if ($result['message']) {
+                       notice($result['message']);
+               }
+               goaway($return_url);
+       } elseif ($result['cid']) {
+               goaway(System::baseUrl().'/contacts/'.$result['cid']);
+       }
+
+       info(L10n::t('The contact could not be added.').EOL);
+
+       goaway($return_url);
+       // NOTREACHED
+}
 
 function follow_content(App $a) {
 
-       if (! local_user()) {
-               notice( t('Permission denied.') . EOL);
+       if (!local_user()) {
+               notice(L10n::t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
        }
@@ -16,7 +58,7 @@ function follow_content(App $a) {
        $uid = local_user();
        $url = notags(trim($_REQUEST['url']));
 
-       $submit = t('Submit Request');
+       $submit = L10n::t('Submit Request');
 
        // There is a current issue. It seems as if you can't start following a Friendica that is following you
        // With Diaspora this works - but Friendica is special, it seems ...
@@ -27,30 +69,30 @@ function follow_content(App $a) {
                dbesc(normalise_link($url)), dbesc($url), dbesc(NETWORK_STATUSNET));
 
        if ($r) {
-               notice(t('You already added this contact.').EOL);
+               notice(L10n::t('You already added this contact.').EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       $ret = probe_url($url);
+       $ret = Probe::uri($url);
 
-       if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) {
-               notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
+       if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+               notice(L10n::t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       if (($ret["network"] == NETWORK_OSTATUS) AND get_config('system','ostatus_disabled')) {
-               notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
+       if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+               notice(L10n::t("OStatus support is disabled. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
        if ($ret["network"] == NETWORK_PHANTOM) {
-               notice( t("The network type couldn't be detected. Contact can't be added.") . EOL);
+               notice(L10n::t("The network type couldn't be detected. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -64,14 +106,14 @@ function follow_content(App $a) {
                $request = $ret["request"];
                $tpl = get_markup_template('dfrn_request.tpl');
        } else {
-               $request = App::get_baseurl()."/follow";
+               $request = System::baseUrl()."/follow";
                $tpl = get_markup_template('auto_request.tpl');
        }
 
        $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", intval($uid));
 
        if (!$r) {
-               notice( t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
        }
@@ -86,7 +128,7 @@ function follow_content(App $a) {
                normalise_link($ret["url"]));
 
        if (!$r) {
-               $r = array(array("location" => "", "about" => "", "keywords" => ""));
+               $r = [["location" => "", "about" => "", "keywords" => ""]];
        } else {
                $gcontact_id = $r[0]["id"];
        }
@@ -96,99 +138,52 @@ function follow_content(App $a) {
                $r[0]["about"] = "";
        }
 
-       $header = $ret["name"];
+       $header = L10n::t("Connect/Follow");
 
-       if ($ret["addr"] != "") {
-               $header .= " <".$ret["addr"].">";
-       }
-
-       //$header .= " (".network_to_name($ret['network'], $ret['url']).")";
-       $header = t("Connect/Follow");
-
-       $o  = replace_macros($tpl,array(
+       $o  = replace_macros($tpl, [
                        '$header' => htmlentities($header),
                        //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
                        '$desc' => "",
-                       '$pls_answer' => t('Please answer the following:'),
-                       '$does_know_you' => array('knowyou', sprintf(t('Does %s know you?'),$ret["name"]), false, '', array(t('No'),t('Yes'))),
-                       '$add_note' => t('Add a personal note:'),
+                       '$pls_answer' => L10n::t('Please answer the following:'),
+                       '$does_know_you' => ['knowyou', L10n::t('Does %s know you?', $ret["name"]), false, '', [L10n::t('No'), L10n::t('Yes')]],
+                       '$add_note' => L10n::t('Add a personal note:'),
                        '$page_desc' => "",
                        '$friendica' => "",
                        '$statusnet' => "",
                        '$diaspora' => "",
                        '$diasnote' => "",
-                       '$your_address' => t('Your Identity Address:'),
+                       '$your_address' => L10n::t('Your Identity Address:'),
                        '$invite_desc' => "",
                        '$emailnet' => "",
                        '$submit' => $submit,
-                       '$cancel' => t('Cancel'),
+                       '$cancel' => L10n::t('Cancel'),
                        '$nickname' => "",
                        '$name' => $ret["name"],
                        '$url' => $ret["url"],
-                       '$zrl' => zrl($ret["url"]),
-                       '$url_label' => t("Profile URL"),
+                       '$zrl' => Profile::zrl($ret["url"]),
+                       '$url_label' => L10n::t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
-                       /*'$location' => bbcode($r[0]["location"]),
-                       '$location_label' => t("Location:"),
-                       '$about' => bbcode($r[0]["about"], false, false),
-                       '$about_label' => t("About:"), */
+                       /*'$location' => Friendica\Content\Text\BBCode::::convert($r[0]["location"]),
+                       '$location_label' => L10n::t("Location:"),
+                       '$about' => Friendica\Content\Text\BBCode::::convert($r[0]["about"], false, false),
+                       '$about_label' => L10n::t("About:"), */
                        '$keywords' => $r[0]["keywords"],
-                       '$keywords_label' => t("Tags:")
-       ));
+                       '$keywords_label' => L10n::t("Tags:")
+       ]);
 
        $a->page['aside'] = "";
-       profile_load($a, "", 0, get_contact_details_by_url($ret["url"]));
+
+       Profile::load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
 
        if ($gcontact_id <> 0) {
                $o .= replace_macros(get_markup_template('section_title.tpl'),
-                                               array('$title' => t('Status Messages and Posts')
-               ));
+                       ['$title' => L10n::t('Status Messages and Posts')]
+               );
 
                // Show last public posts
-               $o .= posts_from_contact_url($a, $ret["url"]);
+               $o .= Contact::getPostsFromUrl($ret["url"]);
        }
 
        return $o;
 }
-
-function follow_post(App $a) {
-
-       if (! local_user()) {
-               notice( t('Permission denied.') . EOL);
-               goaway($_SESSION['return_url']);
-               // NOTREACHED
-       }
-
-       if ($_REQUEST['cancel']) {
-               goaway($_SESSION['return_url']);
-       }
-
-       $uid = local_user();
-       $url = notags(trim($_REQUEST['url']));
-       $return_url = $_SESSION['return_url'];
-
-       // Makes the connection request for friendica contacts easier
-       // This is just a precaution if maybe this page is called somewhere directly via POST
-       $_SESSION["fastlane"] = $url;
-
-       $result = new_contact($uid,$url,true);
-
-       if ($result['success'] == false) {
-               if ($result['message']) {
-                       notice($result['message']);
-               }
-               goaway($return_url);
-       } elseif ($result['cid']) {
-               goaway(App::get_baseurl().'/contacts/'.$result['cid']);
-       }
-
-       info( t('Contact added').EOL);
-
-       if (strstr($return_url,'contacts')) {
-               goaway(App::get_baseurl().'/contacts/'.$contact_id);
-       }
-
-       goaway($return_url);
-       // NOTREACHED
-}