Just some more fixed notice

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 761a9c2b80858bf0d4ea79250798e35748899e9a..d263afc9a0be44a324c5cb59f84bb54419c3f5f8 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -3,31 +3,35 @@
 // See here for a documentation for portable contacts:
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
+
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\DateTimeFormat;
 
 function poco_init(App $a) {
        $system_mode = false;
 
        if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
-               http_status_exit(401);
+               System::httpExit(401);
        }
 
        if ($a->argc > 1) {
                $user = notags(trim($a->argv[1]));
        }
-       if (! x($user)) {
+       if (empty($user)) {
                $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-               if (! DBM::is_result($c)) {
-                       http_status_exit(401);
+               if (!DBM::is_result($c)) {
+                       System::httpExit(401);
                }
                $system_mode = true;
        }
 
-       $format = (($_GET['format']) ? $_GET['format'] : 'json');
+       $format = defaults($_GET, 'format', 'json');
 
        $justme = false;
        $global = false;
@@ -39,10 +43,11 @@ function poco_init(App $a) {
                echo json_encode($ret);
                killme();
        }
+
        if ($a->argc > 1 && $a->argv[1] === '@global') {
                // List of all profiles that this server recently had data from
                $global = true;
-               $update_limit = date("Y-m-d H:i:s", time() - 30 * 86400);
+               $update_limit = date(DateTimeFormat::MYSQL, time() - 30 * 86400);
        }
        if ($a->argc > 2 && $a->argv[2] === '@me') {
                $justme = true;
@@ -63,7 +68,7 @@ function poco_init(App $a) {
                        dbesc($user)
                );
                if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
-                       http_status_exit(404);
+                       System::httpExit(404);
                }
 
                $user = $users[0];
@@ -71,15 +76,15 @@ function poco_init(App $a) {
 
        if ($justme) {
                $sql_extra = " AND `contact`.`self` = 1 ";
+       } else {
+               $sql_extra = "";
        }
-//     else
-//             $sql_extra = " AND `contact`.`self` = 0 ";
 
-       if ($cid) {
+       if (!empty($cid)) {
                $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
        }
        if (x($_GET, 'updatedSince')) {
-               $update_limit = date("Y-m-d H:i:s", strtotime($_GET['updatedSince']));
+               $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
        }
        if ($global) {
                $contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
@@ -107,8 +112,9 @@ function poco_init(App $a) {
        } else {
                $totalResults = 0;
        }
-       $startIndex = intval($_GET['startIndex']);
-       if (! $startIndex) {
+       if (!empty($_GET['startIndex'])) {
+               $startIndex = intval($_GET['startIndex']);
+       } else {
                $startIndex = 0;
        }
        $itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
@@ -199,6 +205,10 @@ function poco_init(App $a) {
        if (is_array($contacts)) {
                if (DBM::is_result($contacts)) {
                        foreach ($contacts as $contact) {
+                               if (!isset($contact['updated'])) {
+                                       $contact['updated'] = '';
+                               }
+
                                if (! isset($contact['generation'])) {
                                        if ($global) {
                                                $contact['generation'] = 3;
@@ -242,8 +252,7 @@ function poco_init(App $a) {
                                }
                                $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
                                if (is_null($about)) {
-                                       require_once 'include/bbcode.php';
-                                       $about = bbcode($contact['about'], false, false);
+                                       $about = BBCode::convert($contact['about'], false);
                                        Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
                                }
 
@@ -357,7 +366,7 @@ function poco_init(App $a) {
                        $ret['entry'][] = [];
                }
        } else {
-               http_status_exit(500);
+               System::httpExit(500);
        }
        logger("End of poco", LOGGER_DEBUG);
 
@@ -371,6 +380,6 @@ function poco_init(App $a) {
                echo json_encode($ret);
                killme();
        } else {
-               http_status_exit(500);
+               System::httpExit(500);
        }
 }