Merge pull request #317 from CatoTH/master

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index 4ab378098902f3fc40c6a9850ea030f4abb609ca..eccb133cc65ed78b271c40ecf2877a6125cd1a4d 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        if(($a->get_curl_code() > 299) || (! $s))
                return;
 
-
        $j = json_decode($s);
 
        logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
@@ -72,21 +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;
+                               }
                        }
                }
 
@@ -101,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))
                                );
                        }
@@ -156,17 +159,11 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
        }
        logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
-       if($zcid) {
-               q("delete from glink where `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 14 DAY",
-                       intval($zcid)
-               );
-       }
-       else {
-               q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
-                       intval($cid),
-                       intval($uid)
-               );
-       }
+       q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
+               intval($cid),
+               intval($uid),
+               intval($zcid)
+       );
 
 }
 
@@ -176,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;
@@ -190,23 +188,70 @@ 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;
 
 }
 
+
+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`.`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))
+               return $r[0]['total'];
+       return 0;
+
+}
+
+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`.`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($start),
+               intval($limit)
+       );
+
+       return $r;
+
+}
+
+
 function count_all_friends($uid,$cid) {
 
        $r = q("SELECT count(*) as `total`