X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=3f519404928134a5bf65ed9248974a4e0d8298c7;hb=59b45f7fc12027c387f04a2121ea398c1d534626;hp=5420b06c89343b49282636c6b9dc0d2163626d0e;hpb=dc46a01cd467ac8c03acda6abcdb3aa56ef2db77;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
old mode 100644
new mode 100755
index 5420b06c89..3f51940492
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -40,16 +40,31 @@ function poco_load($cid,$uid = 0,$url = null) {
 	if(! $url)
 		return;
 
-	logger('poco_load: ' . $url, LOGGER_DATA);
+	$url = $url . (($uid) ? '/@me/@all?fields=displayName,urls,photos' : '?fields=displayName,urls,photos') ;
 
+	logger('poco_load: ' . $url, LOGGER_DEBUG);
 
-	$s = fetch_url($url . ($uid) ? '/@me/@all?fields=displayName,urls,photos' : '?fields=displayName,urls,photos' );
+	$s = fetch_url($url);
+
+	logger('poco_load: returns ' . $s, LOGGER_DATA);
+
+	logger('poco_load: return code: ' . $a->get_curl_code(), LOGGER_DEBUG);
 
 	if(($a->get_curl_code() > 299) || (! $s))
 		return;
+
+
 	$j = json_decode($s);
+
+	logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
+
+	if(! isset($j->entry))
+		return;
+
+	$total = 0;
 	foreach($j->entry as $entry) {
 
+		$total ++;
 		$profile_url = '';
 		$profile_photo = '';
 		$connect_url = '';
@@ -136,6 +151,7 @@ function poco_load($cid,$uid = 0,$url = null) {
 		}
 
 	}
+	logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
 	q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
 		intval($cid),
@@ -214,19 +230,21 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
 
 
-function suggestion_query($uid, $start = 0, $limit = 40) {
+function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	if(! $uid)
 		return array();
 
 	$r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		group by glink.gcid order by total desc limit %d, %d ",
 		intval($uid),
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);
@@ -236,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 40) {
 
 	$r2 = q("SELECT gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d)
+		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		order by rand() limit %d, %d ",
 		intval($uid),
 		intval($uid),
+		intval($uid),
 		intval($start),
 		intval($limit)
 	);