Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
index 8affa11b560cde4514e3576700b27e0f36cc794f..f318dc202c04c9101b72cb9afe9b97352f6cbe3b 100644 (file)
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,11 +2,12 @@
 
 require_once('include/Scrape.php');
 require_once('include/follow.php');
+require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 
-function follow_content(&$a) {
+function follow_content(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -15,6 +16,8 @@ function follow_content(&$a) {
        $uid = local_user();
        $url = notags(trim($_REQUEST['url']));
 
+       $submit = 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 ...
        $r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND ((`rel` != %d) OR (`network` = '%s')) AND
@@ -25,15 +28,31 @@ function follow_content(&$a) {
 
        if ($r) {
                notice(t('You already added this contact.').EOL);
-               goaway($_SESSION['return_url']);
+               $submit = "";
+               //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
        $ret = probe_url($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);
+               $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);
+               $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);
-               goaway($_SESSION['return_url']);
+               $submit = "";
+               //goaway($_SESSION['return_url']);
                // NOTREACHED
        }
 
@@ -44,7 +63,7 @@ function follow_content(&$a) {
                $request = $ret["request"];
                $tpl = get_markup_template('dfrn_request.tpl');
        } else {
-               $request = $a->get_baseurl()."/follow";
+               $request = App::get_baseurl()."/follow";
                $tpl = get_markup_template('auto_request.tpl');
        }
 
@@ -57,26 +76,35 @@ function follow_content(&$a) {
        }
 
        $myaddr = $r[0]["url"];
+       $gcontact_id = 0;
 
        // Makes the connection request for friendica contacts easier
        $_SESSION["fastlane"] = $ret["url"];
 
-       $r = q("SELECT `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
+       $r = q("SELECT `id`, `location`, `about`, `keywords` FROM `gcontact` WHERE `nurl` = '%s'",
                normalise_link($ret["url"]));
 
        if (!$r)
                $r = array(array("location" => "", "about" => "", "keywords" => ""));
+       else
+               $gcontact_id = $r[0]["id"];
+
+       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']).")";
+       //$header .= " (".network_to_name($ret['network'], $ret['url']).")";
+       $header = t("Connect/Follow");
 
        $o  = replace_macros($tpl,array(
                        '$header' => htmlentities($header),
-                       '$photo' => $ret["photo"],
+                       //'$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'))),
@@ -89,7 +117,7 @@ function follow_content(&$a) {
                        '$your_address' => t('Your Identity Address:'),
                        '$invite_desc' => "",
                        '$emailnet' => "",
-                       '$submit' => t('Submit Request'),
+                       '$submit' => $submit,
                        '$cancel' => t('Cancel'),
                        '$nickname' => "",
                        '$name' => $ret["name"],
@@ -98,19 +126,32 @@ function follow_content(&$a) {
                        '$url_label' => t("Profile URL"),
                        '$myaddr' => $myaddr,
                        '$request' => $request,
-                       '$location' => bbcode($r[0]["location"]),
+                       /*'$location' => bbcode($r[0]["location"]),
                        '$location_label' => t("Location:"),
-                       '$about' => proxy_parse_html(bbcode($r[0]["about"], false, false)),
-                       '$about_label' => t("About:"),
+                       '$about' => bbcode($r[0]["about"], false, false),
+                       '$about_label' => t("About:"), */
                        '$keywords' => $r[0]["keywords"],
                        '$keywords_label' => t("Tags:")
        ));
+
+       $a->page['aside'] = "";
+       profile_load($a, "", 0, get_contact_details_by_url($ret["url"]));
+
+       if ($gcontact_id <> 0) {
+               $o .= replace_macros(get_markup_template('section_title.tpl'),
+                                               array('$title' => t('Status Messages and Posts')
+               ));
+
+               // Show last public posts
+               $o .= posts_from_contact_url($a, $ret["url"]);
+       }
+
        return $o;
 }
 
-function follow_post(&$a) {
+function follow_post(App &$a) {
 
-       if(! local_user()) {
+       if (! local_user()) {
                notice( t('Permission denied.') . EOL);
                goaway($_SESSION['return_url']);
                // NOTREACHED
@@ -134,12 +175,12 @@ function follow_post(&$a) {
                        notice($result['message']);
                goaway($return_url);
        } elseif ($result['cid'])
-               goaway($a->get_baseurl().'/contacts/'.$result['cid']);
+               goaway(App::get_baseurl().'/contacts/'.$result['cid']);
 
        info( t('Contact added').EOL);
 
        if(strstr($return_url,'contacts'))
-               goaway($a->get_baseurl().'/contacts/'.$contact_id);
+               goaway(App::get_baseurl().'/contacts/'.$contact_id);
 
        goaway($return_url);
        // NOTREACHED