X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Ffollow.php;h=77c8ae18f3e796cf1c30dcd0c227e1990c789c40;hb=3ca3157e53d9a37f5fee6ef6c459d61b453cca72;hp=31cfcfb64c1f20d4faec0b34dfcee986dc14db7e;hpb=e036434b8a2dbd8594c0ac5ac7233f4700e4e475;p=friendica.git

diff --git a/mod/follow.php b/mod/follow.php
index 31cfcfb64c..77c8ae18f3 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -34,8 +34,12 @@ function follow_post(&$a) {
 		
 		// NOTREACHED
 	}
-	elseif(get_config('system','strict_privacy')) {
-		unset($ret['notify']);
+	else {
+		if(get_config('system','dfrn_only')) {
+			notice( t('This site is not configured to allow communications with other networks.') . EOL);
+			notice( t('No compatible communication protocols or feeds were discovered.') . EOL);
+			goaway($_SESSION['return_url']);
+		}
 	}
 
 	// do we have enough information?
@@ -53,6 +57,10 @@ function follow_post(&$a) {
 		goaway($_SESSION['return_url']);
 	}
 
+	if($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) {
+		notice( t('The profile address specified belongs to a network which has been disabled on this site.') . EOL);
+		$ret['notify'] = '';
+	}
 
 	if(! $ret['notify']) {
 		notice( t('Limited profile. This person will be unable to receive direct/personal notifications from you.') . EOL);
@@ -63,6 +71,9 @@ function follow_post(&$a) {
 		$writeable = 1;
 		
 	}
+	if($ret['network'] === NETWORK_DIASPORA)
+		$writeable = 1;
+
 	// check if we already have a contact
 	// the poll url is more reliable than the profile url, as we may have
 	// indirect links or webfinger links
@@ -74,31 +85,38 @@ function follow_post(&$a) {
 
 	if(count($r)) {
 		// update contact
-		if($r[0]['rel'] == REL_VIP) {
+		if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
 			q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1",
-				intval(REL_BUD),
+				intval(CONTACT_IS_FRIEND),
 				intval($r[0]['id']),
 				intval(local_user())
 			);
 		}
 	}
 	else {
+
+		$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
+		if($ret['network'] === NETWORK_DIASPORA)
+			$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`,
+		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `addr`, `alias`, `batch`, `notify`, `poll`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,
 			`writable`, `blocked`, `readonly`, `pending` )
-			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
+			VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, 0, 0, 0 ) ",
 			intval(local_user()),
 			dbesc(datetime_convert()),
 			dbesc($ret['url']),
 			dbesc($ret['addr']),
 			dbesc($ret['alias']),
+			dbesc($ret['batch']),
 			dbesc($ret['notify']),
 			dbesc($ret['poll']),
 			dbesc($ret['name']),
 			dbesc($ret['nick']),
 			dbesc($ret['photo']),
 			dbesc($ret['network']),
-			intval(($ret['network'] === NETWORK_MAIL) ? REL_BUD : REL_FAN),
+			dbesc($ret['pubkey']),
+			intval($new_relation),
 			intval($ret['priority']),
 			intval($writeable)
 		);
@@ -167,12 +185,19 @@ function follow_post(&$a) {
 			intval(local_user())
 	);
 
-
-	if((count($r)) && (x($contact,'notify')) && (strlen($contact['notify']))) {
-		require_once('include/salmon.php');
-		slapper($r[0],$contact['notify'],$slap);
+	if(count($r)) {
+		if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
+			require_once('include/salmon.php');
+			slapper($r[0],$contact['notify'],$slap);
+		}
+		if($contact['network'] == NETWORK_DIASPORA) {
+			require_once('include/diaspora.php');
+			$ret = diaspora_share($a->user,$contact);
+			logger('mod_follow: diaspora_share returns: ' . $ret);
+		}
 	}
 
-	goaway($_SESSION['return_url']);
+	goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+//	goaway($_SESSION['return_url']);
 	// NOTREACHED
 }