Markdown formatting and minor changes

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index eb5570e8abc165a451cace1de71b41ac778f5ff6..b5e73ca9a44676be10b9f46d4c820ca4a14891ea 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,11 +1,56 @@
 <?php
 
-require_once('include/Scrape.php');
-require_once('include/follow.php');
-require_once('include/Contact.php');
-require_once('include/contact_selectors.php');
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 
-function follow_content(&$a) {
+require_once 'include/follow.php';
+require_once 'include/contact_selectors.php';
+
+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(System::baseUrl().'/contacts/'.$result['cid']);
+       }
+
+       info( t('Contact added').EOL);
+
+       if (strstr($return_url,'contacts')) {
+               goaway(System::baseUrl().'/contacts/'.$contact_id);
+       }
+
+       goaway($return_url);
+       // NOTREACHED
+}
+
+function follow_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL);
@@ -33,16 +78,16 @@ function follow_content(&$a) {
                // NOTREACHED
        }
 
-       $ret = probe_url($url);
+       $ret = Probe::uri($url);
 
-       if (($ret["network"] == NETWORK_DIASPORA) AND !get_config('system','diaspora_enabled')) {
+       if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) {
                notice( 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')) {
+       if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) {
                notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
                $submit = "";
                //goaway($_SESSION['return_url']);
@@ -56,14 +101,15 @@ function follow_content(&$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 {
-               $request = App::get_baseurl()."/follow";
+               $request = System::baseUrl()."/follow";
                $tpl = get_markup_template('auto_request.tpl');
        }
 
@@ -84,22 +130,17 @@ function follow_content(&$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"] != "")
-               $header .= " <".$ret["addr"].">";
-
-       //$header .= " (".network_to_name($ret['network'], $ret['url']).")";
        $header = t("Connect/Follow");
 
        $o  = replace_macros($tpl,array(
@@ -107,7 +148,7 @@ function follow_content(&$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' => "",
@@ -135,7 +176,7 @@ function follow_content(&$a) {
        ));
 
        $a->page['aside'] = "";
-       profile_load($a, "", 0, get_contact_details_by_url($ret["url"]));
+       profile_load($a, "", 0, Contact::getDetailsByURL($ret["url"]));
 
        if ($gcontact_id <> 0) {
                $o .= replace_macros(get_markup_template('section_title.tpl'),
@@ -143,50 +184,8 @@ function follow_content(&$a) {
                ));
 
                // Show last public posts
-               $o .= posts_from_contact_url($a, $ret["url"]);
+               $o .= Contact::getPostsFromUrl($ret["url"]);
        }
 
        return $o;
 }
-
-function follow_post(&$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
-}