X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=include%2Ffollow.php;h=21c05c8f3ef139062963dfbd05446b96f492d9a4;hb=f5597da059b126b6910cfeee7f5d154fa49cdf0b;hp=217b9d07b7b37c22de81af99793c6cd968b1146f;hpb=c67fbc89c426255ffebe940e47435cc149254db8;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index 217b9d07b7..21c05c8f3e 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -9,13 +9,13 @@ function update_contact($id) {
 
 	$r = q("SELECT `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `network` FROM `contact` WHERE `id` = %d", intval($id));
 	if (!$r)
-		return;
+		return false;
 
 	$ret = probe_url($r[0]["url"]);
 
 	// If probe_url fails the network code will be different
 	if ($ret["network"] != $r[0]["network"])
-		return;
+		return false;
 
 	$update = false;
 
@@ -29,7 +29,7 @@ function update_contact($id) {
 	}
 
 	if (!$update)
-		return;
+		return true;
 
 	q("UPDATE `contact` SET `url` = '%s', `nurl` = '%s', `addr` = '%s', `alias` = '%s', `batch` = '%s', `notify` = '%s', `poll` = '%s', `poco` = '%s' WHERE `id` = %d",
 		dbesc($ret['url']),
@@ -42,6 +42,8 @@ function update_contact($id) {
 		dbesc($ret['poco']),
 		intval($id)
 	);
+
+	return true;
 }
 
 //
@@ -152,11 +154,7 @@ function new_contact($uid,$url,$interactive = false) {
 
 	$hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0);
 
-	if($ret['network'] === NETWORK_MAIL) {
-		$writeable = 1;
-
-	}
-	if($ret['network'] === NETWORK_DIASPORA)
+	if(in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA)))
 		$writeable = 1;
 
 	// check if we already have a contact
@@ -213,9 +211,7 @@ function new_contact($uid,$url,$interactive = false) {
 			return $result;
 		}
 
-		$new_relation = (($ret['network'] === NETWORK_MAIL) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
-		if($ret['network'] === NETWORK_DIASPORA)
-			$new_relation = CONTACT_IS_FOLLOWER;
+		$new_relation = ((in_array($ret['network'], array(NETWORK_MAIL, NETWORK_DIASPORA))) ? CONTACT_IS_FRIEND : CONTACT_IS_SHARING);
 
 		// create contact record
 		$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `network`, `pubkey`, `rel`, `priority`,