Merge pull request #1030 from tobiasd/20140622

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 79cf820bcd9b15c1d040d46e3a90406ed2c01530..624a48d9ff1768b4654e59a63d44b20076f8a7b3 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -45,6 +45,8 @@ function poco_init(&$a) {
 
        if($justme)
                $sql_extra = " and `contact`.`self` = 1 ";
+       else
+               $sql_extra = " and `contact`.`self` = 0 ";
 
        if($cid)
                $sql_extra = sprintf(" and `contact`.`id` = %d ",intval($cid));
@@ -54,7 +56,7 @@ function poco_init(&$a) {
                        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
+               $r = q("SELECT count(*) as `total` from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0
                        $sql_extra ",
                        intval($user['uid'])
                );
@@ -79,7 +81,7 @@ function poco_init(&$a) {
        }
        else {
 
-               $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0
+               $r = q("SELECT * from `contact` where `uid` = %d and blocked = 0 and pending = 0 and hidden = 0 and archive = 0
                        $sql_extra LIMIT %d, %d",
                        intval($user['uid']),
                        intval($startIndex),
@@ -146,7 +148,7 @@ 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');
@@ -157,4 +159,4 @@ function poco_init(&$a) {
                http_status_exit(500);
 
 
-}
\ No newline at end of file
+}