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

diff --git a/mod/follow.php b/mod/follow.php
index 14b2ea46c1..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?
 	
@@ -67,6 +80,8 @@ function follow_post(&$a) {
 	}
 
 	$writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0);
+	$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
+
 	if($ret['network'] === NETWORK_MAIL) {
 		$writeable = 1;
 		
@@ -100,23 +115,28 @@ function follow_post(&$a) {
 			$new_relation = CONTACT_IS_FOLLOWER;
 
 		// create contact record 
-		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `rel`, `priority`,
-			`writable`, `blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
+			`writable`, `hidden`, `blocked`, `readonly`, `pending` )
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($ret['url']),
+			dbesc(normalise_link($ret['url'])),
 			dbesc($ret['addr']),
 			dbesc($ret['alias']),
+			dbesc($ret['batch']),
 			dbesc($ret['notify']),
 			dbesc($ret['poll']),
+			dbesc($ret['poco']),
 			dbesc($ret['name']),
 			dbesc($ret['nick']),
 			dbesc($ret['photo']),
 			dbesc($ret['network']),
+			dbesc($ret['pubkey']),
 			intval($new_relation),
 			intval($ret['priority']),
-			intval($writeable)
+			intval($writeable),
+			intval($hidden)
 		);
 	}
 
@@ -190,11 +210,14 @@ function follow_post(&$a) {
 		}
 		if($contact['network'] == NETWORK_DIASPORA) {
 			require_once('include/diaspora.php');
-			$ret = diaspora_share($a->user,$r[0]);
+			$ret = diaspora_share($a->user,$contact);
 			logger('mod_follow: diaspora_share returns: ' . $ret);
 		}
 	}
 
+	if(strstr($_SESSION['return_url'],'contacts'))
+		goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+
 	goaway($_SESSION['return_url']);
 	// NOTREACHED
 }