X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=eccb133cc65ed78b271c40ecf2877a6125cd1a4d;hb=267681844d81364afce37c86f92b803c3d8e4c48;hp=bd1fbded5cecbb7620e76ef7526d89ec412c5ae8;hpb=8bd6e1aef9bcace19e4517b4f53c976d4c0a2760;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index bd1fbded5c..eccb133cc6 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -71,20 +71,24 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 
 		$name = $entry->displayName;
 
-		foreach($entry->urls as $url) {
-			if($url->type == 'profile') {
-				$profile_url = $url->value;
-				continue;
-			}
-			if($url->type == 'webfinger') {
-				$connect_url = str_replace('acct:' , '', $url->value);
-				continue;
+		if(isset($entry->urls)) {
+			foreach($entry->urls as $url) {
+				if($url->type == 'profile') {
+					$profile_url = $url->value;
+					continue;
+				}
+				if($url->type == 'webfinger') {
+					$connect_url = str_replace('acct:' , '', $url->value);
+					continue;
+				}
 			}
-		} 
-		foreach($entry->photos as $photo) {
-			if($photo->type == 'profile') {
-				$profile_photo = $photo->value;
-				continue;
+		}
+		if(isset($entry->photos)) { 
+			foreach($entry->photos as $photo) {
+				if($photo->type == 'profile') {
+					$profile_photo = $photo->value;
+					continue;
+				}
 			}
 		}
 
@@ -99,11 +103,12 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 			$gcid = $x[0]['id'];
 
 			if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo) {
-				q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s' 
+				q("update gcontact set `name` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s' 
 					where `nurl` = '%s' limit 1",
 					dbesc($name),
 					dbesc($profile_photo),
 					dbesc($connect_url),
+					dbesc($profile_url),
 					dbesc(normalise_link($profile_url))
 				);
 			}
@@ -168,13 +173,14 @@ function count_common_friends($uid,$cid) {
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d
-		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ",
+		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
 		intval($cid),
 		intval($uid),
 		intval($uid),
 		intval($cid)
 	);
 
+//	logger("count_common_friends: $uid $cid {$r[0]['total']}"); 
 	if(count($r))
 		return $r[0]['total'];
 	return 0;
@@ -182,17 +188,24 @@ function count_common_friends($uid,$cid) {
 }
 
 
-function common_friends($uid,$cid) {
+function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
+
+	if($shuffle)
+		$sql_extra = " order by rand() ";
+	else
+		$sql_extra = " order by `gcontact`.`name` asc "; 
 
 	$r = q("SELECT `gcontact`.* 
 		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d
-		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) 
-		order by `gcontact`.`name` asc ",
+		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) 
+		$sql_extra limit %d, %d",
 		intval($cid),
 		intval($uid),
 		intval($uid),
-		intval($cid)
+		intval($cid),
+		intval($start),
+		intval($limit)
 	);
 
 	return $r;
@@ -200,18 +213,14 @@ function common_friends($uid,$cid) {
 }
 
 
-function count_common_friends_remote($uid,$cid,$zid) {
+function count_common_friends_zcid($uid,$zcid) {
 
 	$r = q("SELECT count(*) as `total` 
 		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
-		where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d ))
-		and `glink`.`uid` = %d
-		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ",
-		intval($cid),
-		intval($zid),
-		intval($uid),
-		intval($uid),
-		intval($cid)
+		where `glink`.`zcid` = %d
+		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
+		intval($zcid),
+		intval($uid)
 	);
 
 	if(count($r))
@@ -220,19 +229,21 @@ function count_common_friends_remote($uid,$cid,$zid) {
 
 }
 
-function common_friends_remote($uid,$cid,$zid,$limit = 6) {
+function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
+
+	if($shuffle)
+		$sql_extra = " order by rand() ";
+	else
+		$sql_extra = " order by `gcontact`.`name` asc "; 
 
 	$r = q("SELECT `gcontact`.* 
 		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
-		where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d ))
-		and `glink`.`uid` = %d
-		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) 
-		order by `gcontact`.`name` asc limit 0, %d",
-		intval($cid),
-		intval($zid),
-		intval($uid),
+		where `glink`.`zcid` = %d
+		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) 
+		$sql_extra limit %d, %d",
+		intval($zcid),
 		intval($uid),
-		intval($cid),
+		intval($start),
 		intval($limit)
 	);