Merge pull request #1284 from ddorian1/develop

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 79cf820bcd9b15c1d040d46e3a90406ed2c01530..25edabac9ab9d8e95a9c3d7ca03185f5a02cc7b2 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -12,7 +12,7 @@ function poco_init(&$a) {
                $user = notags(trim($a->argv[1]));
        }
        if(! x($user)) {
-               $c = q("select * from pconfig where cat = 'system' and k = 'suggestme' and v = 1");
+               $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
                if(! count($c))
                        http_status_exit(401);
                $system_mode = true;
@@ -30,7 +30,7 @@ function poco_init(&$a) {
                $justme = true;
        if($a->argc > 4 && intval($a->argv[4]) && $justme == false)
                $cid = intval($a->argv[4]);
-               
+
 
        if(! $system_mode) {
                $r = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
@@ -44,19 +44,30 @@ function poco_init(&$a) {
        }
 
        if($justme)
-               $sql_extra = " and `contact`.`self` = 1 ";
+               $sql_extra = " AND `contact`.`self` = 1 ";
+       else
+               $sql_extra = " AND `contact`.`self` = 0 ";
 
        if($cid)
-               $sql_extra = sprintf(" and `contact`.`id` = %d ",intval($cid));
+               $sql_extra = sprintf(" AND `contact`.`id` = %d ",intval($cid));
 
        if($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) ");
+               $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '')
+                       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)
+                       );
        }
        else {
-               $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0
-                       $sql_extra ",
-                       intval($user['uid'])
+               $r = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                       AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra",
+                       intval($user['uid']),
+                       dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_DIASPORA),
+                       dbesc(NETWORK_OSTATUS),
+                       dbesc(NETWORK_STATUSNET)
                );
        }
        if(count($r))
@@ -71,17 +82,24 @@ function poco_init(&$a) {
 
 
        if($system_mode) {
-               $r = q("SELECT * from contact where self = 1 
-                       and uid in (select uid from pconfig where cat = 'system' and k = 'suggestme' and v = 1) limit %d, %d ",
+               $r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `network` IN ('%s', '%s', '%s', '%s', '')
+                       AND `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 {
-
-               $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0
-                       $sql_extra LIMIT %d, %d",
+               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                       AND `network` IN ('%s', '%s', '%s', '%s', '') $sql_extra LIMIT %d, %d",
                        intval($user['uid']),
+                       dbesc(NETWORK_DFRN),
+                       dbesc(NETWORK_DIASPORA),
+                       dbesc(NETWORK_OSTATUS),
+                       dbesc(NETWORK_STATUSNET),
                        intval($startIndex),
                        intval($itemsPerPage)
                );
@@ -104,8 +122,10 @@ function poco_init(&$a) {
                'id' => false,
                'displayName' => false,
                'urls' => false,
+               'updated' => false,
                'preferredUsername' => false,
-               'photos' => false
+               'photos' => false,
+               'network' => false
        );
 
        if((! x($_GET,'fields')) || ($_GET['fields'] === '@all'))
@@ -128,12 +148,31 @@ function poco_init(&$a) {
                                if($fields_ret['urls']) {
                                        $entry['urls'] = array(array('value' => $rr['url'], 'type' => 'profile'));
                                        if($rr['addr'] && ($rr['network'] !== NETWORK_MAIL))
-                                               $entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');  
+                                               $entry['urls'][] = array('value' => 'acct:' . $rr['addr'], 'type' => 'webfinger');
                                }
                                if($fields_ret['preferredUsername'])
                                        $entry['preferredUsername'] = $rr['nick'];
+                               if($fields_ret['updated']) {
+                                       $entry['updated'] = $rr['success_update'];
+
+                                       if ($rr['name-date'] > $entry['updated'])
+                                               $entry['updated'] = $rr['name-date'];
+
+                                       if ($rr['uri-date'] > $entry['updated'])
+                                               $entry['updated'] = $rr['uri-date'];
+
+                                       if ($rr['avatar-date'] > $entry['updated'])
+                                               $entry['updated'] = $rr['avatar-date'];
+
+                                       $entry['updated'] = date("c", strtotime($entry['updated']));
+                               }
                                if($fields_ret['photos'])
                                        $entry['photos'] = array(array('value' => $rr['photo'], 'type' => 'profile'));
+                               if($fields_ret['network']) {
+                                       $entry['network'] = $rr['network'];
+                                       if ($entry['network'] == NETWORK_STATUSNET)
+                                               $entry['network'] = NETWORK_OSTATUS;
+                               }
                                $ret['entry'][] = $entry;
                        }
                }
@@ -146,15 +185,15 @@ function poco_init(&$a) {
        if($format === 'xml') {
                header('Content-type: text/xml');
                echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
-               http_status_exit(500);
+               killme();
        }
        if($format === 'json') {
                header('Content-type: application/json');
                echo json_encode($ret);
-               killme();       
+               killme();
        }
        else
                http_status_exit(500);
 
 
-}
\ No newline at end of file
+}