Merge develop into 3011_hcard_vcard

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 0b08e30bf0b82442896c9ef7d7b913f41628e587..ae03aef2cdba27e352834301bde64db12b1149dc 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -61,22 +61,20 @@ function poco_init(&$a) {
                $update_limit =  date("Y-m-d H:i:s",strtotime($_GET['updatedSince']));
 
        if ($global) {
-               $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`))  AND `network` IN ('%s')",
+               //$r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND ((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`))  AND `network` IN ('%s')",
+               $r = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure`  AND `network` IN ('%s', '%s', '%s')",
                        dbesc($update_limit),
-                       dbesc(NETWORK_DFRN)
-               );
-       } elseif($system_mode) {
-               $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '')
-                       AND `success_update` >= `failure_update`
-                       AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ",
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_DIASPORA),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_STATUSNET)
-                       );
+                       dbesc(NETWORK_OSTATUS)
+               );
+       } elseif($system_mode) {
+               $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
+                       AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
        } else {
                $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
-                       AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra",
+                       AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
+                       AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
                        intval($user['uid']),
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_DIASPORA),
@@ -94,31 +92,33 @@ function poco_init(&$a) {
                $startIndex = 0;
        $itemsPerPage = ((x($_GET,'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
-
        if ($global) {
-               $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d",
+               logger("Start global query", LOGGER_DEBUG);
+               //$r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s') AND ((`last_contact` >= `last_failure`) OR (`updated` > `last_failure`)) LIMIT %d, %d",
+               $r = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
+                       ORDER BY `updated` DESC LIMIT %d, %d",
                        dbesc($update_limit),
                        dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_DIASPORA),
+                       dbesc(NETWORK_OSTATUS),
                        intval($startIndex),
                        intval($itemsPerPage)
                );
        } elseif($system_mode) {
+               logger("Start system mode query", LOGGER_DEBUG);
                $r = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`, `profile`.`gender` AS `pgender`,
                        `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`, `profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`
                        FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
-                       WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '') AND `profile`.`is-default`
-                       AND ((`contact`.`success_update` >= `contact`.`failure_update`) OR (`contact`.`last-item` >= `contact`.`failure_update`))
+                       WHERE `self` = 1 AND `profile`.`is-default`
                        AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d",
-                       dbesc(NETWORK_DFRN),
-                       dbesc(NETWORK_DIASPORA),
-                       dbesc(NETWORK_OSTATUS),
-                       dbesc(NETWORK_STATUSNET),
                        intval($startIndex),
                        intval($itemsPerPage)
                );
        } else {
+               logger("Start query for user ".$user['nickname'], LOGGER_DEBUG);
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
-                       AND `success_update` >= `failure_update` AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra LIMIT %d, %d",
+                       AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
+                       AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
                        intval($user['uid']),
                        dbesc(NETWORK_DFRN),
                        dbesc(NETWORK_DIASPORA),
@@ -128,6 +128,7 @@ function poco_init(&$a) {
                        intval($itemsPerPage)
                );
        }
+       logger("Query done", LOGGER_DEBUG);
 
        $ret = array();
        if(x($_GET,'sorted'))
@@ -208,13 +209,26 @@ function poco_init(&$a) {
                                if (($rr['keywords'] == "") AND isset($rr['pub_keywords']))
                                        $rr['keywords'] = $rr['pub_keywords'];
 
+                               $about = Cache::get("about:".$rr['updated'].":".$rr['nurl']);
+                               if (is_null($about)) {
+                                       $about = bbcode($rr['about'], false, false);
+                                       Cache::set("about:".$rr['updated'].":".$rr['nurl'],$about);
+                               }
+
+                               // Non connected persons can only see the keywords of a Diaspora account
+                               if ($rr['network'] == NETWORK_DIASPORA) {
+                                       $rr['location'] = "";
+                                       $about = "";
+                                       $rr['gender'] = "";
+                               }
+
                                $entry = array();
                                if($fields_ret['id'])
                                        $entry['id'] = (int)$rr['id'];
                                if($fields_ret['displayName'])
                                        $entry['displayName'] = $rr['name'];
                                if($fields_ret['aboutMe'])
-                                       $entry['aboutMe'] = bbcode($rr['about'], false, false);
+                                       $entry['aboutMe'] = $about;
                                if($fields_ret['currentLocation'])
                                        $entry['currentLocation'] = $rr['location'];
                                if($fields_ret['gender'])
@@ -297,6 +311,8 @@ function poco_init(&$a) {
        else
                http_status_exit(500);
 
+       logger("End of poco", LOGGER_DEBUG);
+
        if($format === 'xml') {
                header('Content-type: text/xml');
                echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));