Merge pull request #578 from fermionic/20130110-update-smarty-conversion-script

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index a08d58074187eead84b196a7263671c302a169ab..45048d8da53e1ac1efd8decbaaca5da21c6c2ce6 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -2,7 +2,6 @@
 
 require_once('include/datetime.php');
 
-
 /*
  * poco_load
  *
@@ -71,20 +70,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 +102,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 +172,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 +187,23 @@ function count_common_friends($uid,$cid) {
 }
 
 
-function common_friends($uid,$cid,$limit=9999) {
+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 limit 0, %d",
+               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($start),
                intval($limit)
        );
 
@@ -206,7 +217,7 @@ 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 `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 ) ",
                intval($zcid),
                intval($uid)
        );
@@ -217,15 +228,21 @@ function count_common_friends_zcid($uid,$zcid) {
 
 }
 
-function common_friends_zcid($uid,$zcid,$limit = 6) {
+function common_friends_zcid($uid,$zcid,$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`.`zcid` = %d
-               and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) 
-               order by `gcontact`.`name` asc limit 0, %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)
        );