X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=ae8cb200c74f68f1d70f1a1440e20038f2f8e50d;hb=60871555f539caec07f2dcfe37f11fc090bac1be;hp=2d643400a7c6748c09cf71ab461c6463a1331235;hpb=47f369e052d296f4a744c1508efc58f6168b7e8b;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 2d643400a7..ae8cb200c7 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -2,7 +2,7 @@
 
 require_once('Scrape.php');
 
-function follow_post(&$a) {
+function follow_init(&$a) {
 
 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@@ -10,7 +10,7 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
-	$url = $orig_url = notags(trim($_POST['url']));
+	$url = $orig_url = notags(trim($_REQUEST['url']));
 
 	// remove ajax junk, e.g. Twitter
 
@@ -22,6 +22,14 @@ function follow_post(&$a) {
 		// NOTREACHED
 	}
 
+
+	if(! $url) {
+		notice( t('Connect URL missing.') . EOL);
+		goaway($_SESSION['return_url']);
+		// NOTREACHED
+	}
+
+
 	$ret = probe_url($url);
 
 	if($ret['network'] === NETWORK_DFRN) {
@@ -41,6 +49,11 @@ function follow_post(&$a) {
 			goaway($_SESSION['return_url']);
 		}
 	}
+	
+	// This just confuses things, remove it
+	if($ret['network'] === NETWORK_DIASPORA)
+		$ret['url'] = str_replace('?absolute=true','',$ret['url']);
+
 
 	// do we have enough information?
 	
@@ -202,7 +215,9 @@ function follow_post(&$a) {
 		}
 	}
 
-	goaway($a->get_baseurl() . '/contacts/' . $contact_id);
-//	goaway($_SESSION['return_url']);
+	if(strstr($_SESSION['return_url'],'contacts'))
+		goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
+	goaway($_SESSION['return_url']);
 	// NOTREACHED
 }