Merge pull request #2172 from tobiasd/20151212-frosticons

[friendica.git] / include / socgraph.php

diff --git a/include/socgraph.php b/include/socgraph.php
index 5c8da3cc2a144e177870c354785accb315c68d13..559b1832b2f8da8ade9882bc94477890fc2470ae 100644 (file)
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -235,7 +235,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
                $addr = "";
        }
 
-       if ((($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
+       if ((($network == "") OR ($name == "") OR ($addr == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
                AND poco_reachable($profile_url, $server_url, $network, false)) {
                $data = probe_url($profile_url);
 
@@ -1047,8 +1047,9 @@ function count_common_friends($uid,$cid) {
 
        $r = q("SELECT count(*) as `total`
                FROM `glink` INNER 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 ) ",
+               WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
+               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+               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),
@@ -1077,6 +1078,7 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
                WHERE `glink`.`cid` = %d and `glink`.`uid` = %d
                        AND `contact`.`uid` = %d AND `contact`.`self` = 0 AND `contact`.`blocked` = 0
                        AND `contact`.`hidden` = 0 AND `contact`.`id` != %d
+                       AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
                        $sql_extra LIMIT %d, %d",
                intval($cid),
                intval($uid),
@@ -1134,7 +1136,8 @@ function count_all_friends($uid,$cid) {
 
        $r = q("SELECT count(*) as `total`
                FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
-               where `glink`.`cid` = %d and `glink`.`uid` = %d ",
+               where `glink`.`cid` = %d and `glink`.`uid` = %d AND
+               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))",
                intval($cid),
                intval($uid)
        );
@@ -1152,7 +1155,8 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) {
                FROM `glink`
                INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
                LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d
-               WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d
+               WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
+               ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
                ORDER BY `gcontact`.`name` ASC LIMIT %d, %d ",
                intval($uid),
                intval($cid),
@@ -1184,14 +1188,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        $sql_network = "'".$sql_network."'";
 
        $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact
-               INNER JOIN glink on glink.gcid = gcontact.id
+               INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
                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 )
+               AND NOT `gcontact`.`name` IN (SELECT `name` FROM `contact` WHERE `uid` = %d)
+               AND NOT `gcontact`.`id` IN (SELECT `gcid` FROM `gcign` WHERE `uid` = %d)
                AND `gcontact`.`updated` != '0000-00-00 00:00:00'
                AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
-               group by glink.gcid order by gcontact.updated desc,total desc limit %d, %d ",
+               GROUP BY `glink`.`gcid` ORDER BY `gcontact`.`updated` DESC,`total` DESC LIMIT %d, %d",
                intval($uid),
                intval($uid),
                intval($uid),
@@ -1204,14 +1208,15 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        if(count($r) && count($r) >= ($limit -1))
                return $r;
 
-       $r2 = q("SELECT gcontact.* from gcontact
-               INNER JOIN glink on glink.gcid = gcontact.id
-               where glink.uid = 0 and glink.cid = 0 and glink.zcid = 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 )
+       $r2 = q("SELECT gcontact.* FROM gcontact
+               INNER JOIN `glink` ON `glink`.`gcid` = `gcontact`.`id`
+               WHERE `glink`.`uid` = 0 AND `glink`.`cid` = 0 AND `glink`.`zcid` = 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)
                AND `gcontact`.`updated` != '0000-00-00 00:00:00'
+               AND `gcontact`.`last_contact` >= `gcontact`.`last_failure`
                AND `gcontact`.`network` IN (%s)
-               order by rand() limit %d, %d ",
+               ORDER BY rand() LIMIT %d, %d",
                intval($uid),
                intval($uid),
                intval($uid),
@@ -1227,6 +1232,9 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
        foreach ($r AS $suggestion)
                $list[$suggestion["nurl"]] = $suggestion;
 
+       while (sizeof($list) > ($limit))
+               array_pop($list);
+
        return $list;
 }