Fix formatting in mod/follow

diff --git a/mod/follow.php b/mod/follow.php
index 1dc20d16d114089eff2f665f8108b2b20e966607..639fa068677fb598de2cd2f7e70d79b1afa62df7 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -11,10 +11,10 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Database\DBM;
 
-function follow_post(App $a) {
-
+function follow_post(App $a)
+{
        if (!local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.'));
                goaway($_SESSION['return_url']);
                // NOTREACHED
        }
@@ -29,7 +29,7 @@ function follow_post(App $a) {
 
        // 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;
+       $_SESSION['fastlane'] = $url;
 
        $result = Contact::createFromProbe($uid, $url, true);
 
@@ -39,19 +39,19 @@ function follow_post(App $a) {
                }
                goaway($return_url);
        } elseif ($result['cid']) {
-               goaway(System::baseUrl().'/contacts/'.$result['cid']);
+               goaway(System::baseUrl() . '/contacts/' . $result['cid']);
        }
 
-       info(L10n::t('The contact could not be added.').EOL);
+       info(L10n::t('The contact could not be added.'));
 
        goaway($return_url);
        // NOTREACHED
 }
 
-function follow_content(App $a) {
-
+function follow_content(App $a)
+{
        if (!local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.'));
                goaway($_SESSION['return_url']);
                // NOTREACHED
        }
@@ -70,8 +70,8 @@ function follow_content(App $a) {
 
        if ($r) {
                if ($r[0]['pending']) {
-                       notice(L10n::t('You already added this contact.').EOL);
-                       $submit = "";
+                       notice(L10n::t('You already added this contact.'));
+                       $submit = '';
                        //goaway($_SESSION['return_url']);
                        // NOTREACHED
                }
@@ -79,104 +79,104 @@ function follow_content(App $a) {
 
        $ret = Probe::uri($url);
 
-       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 = "";
+       if (($ret['network'] == NETWORK_DIASPORA) && !Config::get('system', 'diaspora_enabled')) {
+               notice(L10n::t("Diaspora support isn't enabled. Contact can't be added."));
+               $submit = '';
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
-               notice(L10n::t("OStatus support is disabled. Contact can't be added.") . EOL);
-               $submit = "";
+       if (($ret['network'] == NETWORK_OSTATUS) && Config::get('system', 'ostatus_disabled')) {
+               notice(L10n::t("OStatus support is disabled. Contact can't be added."));
+               $submit = '';
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       if ($ret["network"] == NETWORK_PHANTOM) {
-               notice(L10n::t("The network type couldn't be detected. Contact can't be added.") . EOL);
-               $submit = "";
+       if ($ret['network'] == NETWORK_PHANTOM) {
+               notice(L10n::t("The network type couldn't be detected. Contact can't be added."));
+               $submit = '';
                //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       if ($ret["network"] == NETWORK_MAIL) {
-               $ret["url"] = $ret["addr"];
+       if ($ret['network'] == NETWORK_MAIL) {
+               $ret['url'] = $ret['addr'];
        }
 
        if (($ret['network'] === NETWORK_DFRN) && !DBM::is_result($r)) {
-               $request = $ret["request"];
+               $request = $ret['request'];
                $tpl = get_markup_template('dfrn_request.tpl');
        } else {
-               $request = System::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(L10n::t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.'));
                goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
-       $myaddr = $r[0]["url"];
+       $myaddr = $r[0]['url'];
        $gcontact_id = 0;
 
        // Makes the connection request for friendica contacts easier
-       $_SESSION["fastlane"] = $ret["url"];
+       $_SESSION['fastlane'] = $ret['url'];
 
        $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
-               normalise_link($ret["url"]));
+               normalise_link($ret['url']));
 
        if (!$r) {
-               $r = [["location" => "", "about" => "", "keywords" => ""]];
+               $r = [['location' => '', 'about' => '', 'keywords' => '']];
        } else {
-               $gcontact_id = $r[0]["id"];
+               $gcontact_id = $r[0]['id'];
        }
 
        if ($ret['network'] === NETWORK_DIASPORA) {
-               $r[0]["location"] = "";
-               $r[0]["about"] = "";
+               $r[0]['location'] = '';
+               $r[0]['about'] = '';
        }
 
-       $header = L10n::t("Connect/Follow");
-
-       $o  = replace_macros($tpl, [
-                       '$header' => htmlentities($header),
-                       //'$photo' => proxy_url($ret["photo"], false, PROXY_SIZE_SMALL),
-                       '$desc' => "",
-                       '$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' => L10n::t('Your Identity Address:'),
-                       '$invite_desc' => "",
-                       '$emailnet' => "",
-                       '$submit' => $submit,
-                       '$cancel' => L10n::t('Cancel'),
-                       '$nickname' => "",
-                       '$name' => $ret["name"],
-                       '$url' => $ret["url"],
-                       '$zrl' => Profile::zrl($ret["url"]),
-                       '$url_label' => L10n::t("Profile URL"),
-                       '$myaddr' => $myaddr,
-                       '$request' => $request,
-                       /*'$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' => L10n::t("Tags:")
+       $header = L10n::t('Connect/Follow');
+
+       $o = replace_macros($tpl, [
+               '$header'        => htmlentities($header),
+               //'$photo' => proxy_url($ret['photo'], false, PROXY_SIZE_SMALL),
+               '$desc'          => '',
+               '$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'  => L10n::t('Your Identity Address:'),
+               '$invite_desc'   => '',
+               '$emailnet'      => '',
+               '$submit'        => $submit,
+               '$cancel'        => L10n::t('Cancel'),
+               '$nickname'      => '',
+               '$name'          => $ret['name'],
+               '$url'           => $ret['url'],
+               '$zrl'           => Profile::zrl($ret['url']),
+               '$url_label'     => L10n::t('Profile URL'),
+               '$myaddr'        => $myaddr,
+               '$request'       => $request,
+               /*'$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'=> L10n::t('Tags:')
        ]);
 
-       $a->page['aside'] = "";
+       $a->page['aside'] = '';
 
-       Profile::load($a, "", 0, Contact::getDetailsByURL($ret["url"]), false);
+       Profile::load($a, '', 0, Contact::getDetailsByURL($ret['url']), false);
 
        if ($gcontact_id <> 0) {
                $o .= replace_macros(get_markup_template('section_title.tpl'),
@@ -184,7 +184,7 @@ function follow_content(App $a) {
                );
 
                // Show last public posts
-               $o .= Contact::getPostsFromUrl($ret["url"]);
+               $o .= Contact::getPostsFromUrl($ret['url']);
        }
 
        return $o;