Merge remote-tracking branch 'upstream/develop' into 1601-dfrn-import

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index b0ad2d4a0f741190c5af8cced8d05651f3bc4d4c..2741ad59b4f2c1f3cc66eb4a064792df5120dd5c 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -10,6 +10,7 @@
  */
 
 require_once('include/enotify.php');
+require_once('include/Scrape.php');
 
 if(! function_exists('dfrn_request_init')) {
 function dfrn_request_init(&$a) {
@@ -112,8 +113,6 @@ function dfrn_request_post(&$a) {
                                         * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
                                         */
 
-                                       require_once('include/Scrape.php');
-
                                        $parms = scrape_dfrn($dfrn_url);
 
                                        if(! count($parms)) {
@@ -441,31 +440,29 @@ function dfrn_request_post(&$a) {
 
                        // Next send an email verify form to the requestor.
 
-               }
-
-               else {
+               } else {
+                       // Detect the network
+                       $data = probe_url($url);
+                       $network = $data["network"];
 
                        // Canonicalise email-style profile locator
-
                        $url = webfinger_dfrn($url,$hcard);
 
-                       if(substr($url,0,5) === 'stat:') {
-                               $network = NETWORK_OSTATUS;
+                       if (substr($url,0,5) === 'stat:') {
+
+                               // Every time we detect the remote subscription we define this as OStatus.
+                               // We do this even if it is not OStatus.
+                               // we only need to pass this through another section of the code.
+                               if ($network != NETWORK_DIASPORA)
+                                       $network = NETWORK_OSTATUS;
+
                                $url = substr($url,5);
-                       }
-                       else {
+                       } else
                                $network = NETWORK_DFRN;
-                       }
                }
 
                logger('dfrn_request: url: ' . $url);
 
-               if(! strlen($url)) {
-                       notice( t("Unable to resolve your name at the provided location.") . EOL);
-                       return;
-               }
-
-
                if($network === NETWORK_DFRN) {
                        $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
                                intval($uid),
@@ -610,24 +607,34 @@ function dfrn_request_post(&$a) {
                        );
                        // NOTREACHED
                        // END $network === NETWORK_DFRN
-               }
-               elseif($network === NETWORK_OSTATUS) {
+               } elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
 
                        /**
                         *
-                        * OStatus network
-                        * Check contact existence
-                        * Try and scrape together enough information to create a contact record,
-                        * with us as CONTACT_IS_FOLLOWER
                         * Substitute our user's feed URL into $url template
                         * Send the subscriber home to subscribe
                         *
                         */
 
-                       $url = str_replace('{uri}', $a->get_baseurl() . '/profile/' . $nickname, $url);
+                       // Diaspora needs the uri in the format user@domain.tld
+                       // Diaspora will support the remote subscription in a future version
+                       if ($network == NETWORK_DIASPORA) {
+                               $uri = $nickname.'@'.$a->get_hostname();
+
+                               if ($a->get_path())
+                                       $uri .= '/'.$a->get_path();
+
+                               $uri = urlencode($uri);
+                       } else
+                               $uri = $a->get_baseurl().'/profile/'.$nickname;
+
+                       $url = str_replace('{uri}', $uri, $url);
                        goaway($url);
                        // NOTREACHED
-                       // END $network === NETWORK_OSTATUS
+                       // END $network != NETWORK_PHANTOM
+               } else {
+                       notice(t("Remote subscription can't be done for your network. Please subscribe directly on your system.").EOL);
+                       return;
                }
 
        }       return;