Merge https://github.com/friendica/friendica into pull

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index a67b3d9e34f7868148feefc9bab17696d043580f..592779089785a4fc36bee616e0a0cf6fcd20670a 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -176,6 +176,7 @@ function count_common_friends($uid,$cid) {
                intval($cid)
        );
 
+//     logger("count_common_friends: $uid $cid {$r[0]['total']}"); 
        if(count($r))
                return $r[0]['total'];
        return 0;
@@ -183,7 +184,7 @@ function count_common_friends($uid,$cid) {
 }
 
 
-function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
+function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 
        if($shuffle)
                $sql_extra = " order by rand() ";
@@ -194,11 +195,12 @@ function common_friends($uid,$cid,$limit=9999,$shuffle = false) {
                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 blocked = 0 and hidden = 0 and id != %d ) 
-               $sql_extra limit 0, %d",
+               $sql_extra limit %d, %d",
                intval($cid),
                intval($uid),
                intval($uid),
                intval($cid),
+               intval($start),
                intval($limit)
        );
 
@@ -223,7 +225,7 @@ function count_common_friends_zcid($uid,$zcid) {
 
 }
 
-function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
+function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
 
        if($shuffle)
                $sql_extra = " order by rand() ";
@@ -234,9 +236,10 @@ function common_friends_zcid($uid,$zcid,$limit = 9999,$shuffle) {
                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 0, %d",
+               $sql_extra limit %d, %d",
                intval($zcid),
                intval($uid),
+               intval($start),
                intval($limit)
        );