Merge branch 'pull'

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
old mode 100644 (file)
new mode 100755 (executable)
index 60bf075..3f51940
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -58,6 +58,9 @@ function poco_load($cid,$uid = 0,$url = null) {
 
        logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
 
+       if(! isset($j->entry))
+               return;
+
        $total = 0;
        foreach($j->entry as $entry) {
 
@@ -227,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)
        );
@@ -249,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)
        );