X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Ffollow.php;h=f753206efcde106f36f06bb48d60bccbf0c1d174;hb=1c82ad073463097ba7e3918be7fbc0863789ee7c;hp=d0411a466af0411045ed9455f2c25019a67a3c00;hpb=dfa5183774e24fe2b1a355c9427372d4cd55ea70;p=friendica.git

diff --git a/include/follow.php b/include/follow.php
index d0411a466a..f753206efc 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,6 +1,7 @@
 <?php
 require_once("include/Scrape.php");
 require_once("include/socgraph.php");
+require_once('include/group.php');
 
 function update_contact($id) {
 	/*
@@ -172,12 +173,12 @@ function new_contact($uid,$url,$interactive = false) {
 		dbesc($ret['network'])
 	);
 
-	if(!count($r))
+	if (!dbm::is_result($r))
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `network` = '%s' LIMIT 1",
 			intval($uid), dbesc(normalise_link($url)), dbesc($ret['network'])
 	);
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		// update contact
 		if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) {
 			q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d",
@@ -195,7 +196,7 @@ function new_contact($uid,$url,$interactive = false) {
 		$r = q("select count(*) as total from contact where uid = %d and pending = 0 and self = 0",
 			intval($uid)
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$total_contacts = $r[0]['total'];
 
 		if(! service_class_allows($uid,'total_contacts',$total_contacts)) {
@@ -207,7 +208,7 @@ function new_contact($uid,$url,$interactive = false) {
 			intval($uid),
 			dbesc($network)
 		);
-		if(count($r))
+		if (dbm::is_result($r))
 			$total_network = $r[0]['total'];
 
 		if(! service_class_allows($uid,'total_contacts_' . $network,$total_network)) {
@@ -249,7 +250,7 @@ function new_contact($uid,$url,$interactive = false) {
 		intval($uid)
 	);
 
-	if(! count($r)) {
+	if(! dbm::is_result($r)) {
 		$result['message'] .=  t('Unable to retrieve contact information.') . EOL;
 		return $result;
 	}
@@ -259,10 +260,8 @@ function new_contact($uid,$url,$interactive = false) {
 	$result['cid'] = $contact_id;
 
 	$def_gid = get_default_group($uid, $contact["network"]);
-	if (intval($def_gid)) {
-		require_once('include/group.php');
+	if (intval($def_gid))
 		group_add_member($uid, '', $contact_id, $def_gid);
-	}
 
 	require_once("include/Photo.php");
 
@@ -271,7 +270,7 @@ function new_contact($uid,$url,$interactive = false) {
 
 	// pull feed and consume it, which should subscribe to the hub.
 
-	proc_run('php',"include/onepoll.php","$contact_id", "force");
+	proc_run(PRIORITY_HIGH, "include/onepoll.php", $contact_id, "force");
 
 	// create a follow slap
 
@@ -296,7 +295,7 @@ function new_contact($uid,$url,$interactive = false) {
 			intval($uid)
 	);
 
-	if(count($r)) {
+	if (dbm::is_result($r)) {
 		if(($contact['network'] == NETWORK_OSTATUS) && (strlen($contact['notify']))) {
 			require_once('include/salmon.php');
 			slapper($r[0],$contact['notify'],$slap);