X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=6e1f9069472040cf56b51ad262bbc2f31467235f;hb=1058b28ceabcec802932fc33bb79e6ce7814f945;hp=f318dc202c04c9101b72cb9afe9b97352f6cbe3b;hpb=8ec5b06e0440302cef9f6bc2f35730fca5a9030e;p=friendica.git diff --git a/mod/follow.php b/mod/follow.php index f318dc202c..6e1f906947 100644 --- a/mod/follow.php +++ b/mod/follow.php @@ -5,7 +5,7 @@ require_once('include/follow.php'); require_once('include/Contact.php'); require_once('include/contact_selectors.php'); -function follow_content(App &$a) { +function follow_content(App $a) { if (! local_user()) { notice( t('Permission denied.') . EOL); @@ -56,10 +56,11 @@ function follow_content(App &$a) { // NOTREACHED } - if ($ret["network"] == NETWORK_MAIL) + if ($ret["network"] == NETWORK_MAIL) { $ret["url"] = $ret["addr"]; + } - if($ret['network'] === NETWORK_DFRN) { + if ($ret['network'] === NETWORK_DFRN) { $request = $ret["request"]; $tpl = get_markup_template('dfrn_request.tpl'); } else { @@ -84,20 +85,22 @@ function follow_content(App &$a) { $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'", normalise_link($ret["url"])); - if (!$r) + if (!$r) { $r = array(array("location" => "", "about" => "", "keywords" => "")); - else + } else { $gcontact_id = $r[0]["id"]; + } - if($ret['network'] === NETWORK_DIASPORA) { + if ($ret['network'] === NETWORK_DIASPORA) { $r[0]["location"] = ""; $r[0]["about"] = ""; } $header = $ret["name"]; - if ($ret["addr"] != "") + if ($ret["addr"] != "") { $header .= " <".$ret["addr"].">"; + } //$header .= " (".network_to_name($ret['network'], $ret['url']).")"; $header = t("Connect/Follow"); @@ -107,7 +110,7 @@ function follow_content(App &$a) { //'$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'))), + '$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:'), '$page_desc' => "", '$friendica' => "", @@ -149,7 +152,7 @@ function follow_content(App &$a) { return $o; } -function follow_post(App &$a) { +function follow_post(App $a) { if (! local_user()) { notice( t('Permission denied.') . EOL); @@ -157,8 +160,9 @@ function follow_post(App &$a) { // NOTREACHED } - if ($_REQUEST['cancel']) + if ($_REQUEST['cancel']) { goaway($_SESSION['return_url']); + } $uid = local_user(); $url = notags(trim($_REQUEST['url'])); @@ -170,17 +174,20 @@ function follow_post(App &$a) { $result = new_contact($uid,$url,true); - if($result['success'] == false) { - if($result['message']) + if ($result['success'] == false) { + if ($result['message']) { notice($result['message']); + } goaway($return_url); - } elseif ($result['cid']) + } elseif ($result['cid']) { goaway(App::get_baseurl().'/contacts/'.$result['cid']); + } info( t('Contact added').EOL); - if(strstr($return_url,'contacts')) + if (strstr($return_url,'contacts')) { goaway(App::get_baseurl().'/contacts/'.$contact_id); + } goaway($return_url); // NOTREACHED