Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / mod / follow.php

diff --git a/mod/follow.php b/mod/follow.php
old mode 100644 (file)
new mode 100755 (executable)
index 5fdb938..ae8cb20
--- 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);
@@ -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
 }