Merge pull request #7988 from friendica/MrPetovan-notice

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 08677ef8d46b1ff9da75c6227121f92745c8cccd..2ed871285b76586b38e30eb63def4c6d49816cb9 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -15,27 +15,28 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 function poco_init(App $a) {
        $system_mode = false;
 
        if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
-               System::httpExit(401);
+               throw new \Friendica\Network\HTTPException\ForbiddenException();
        }
 
        if ($a->argc > 1) {
-               $user = notags(trim($a->argv[1]));
+               $nickname = Strings::escapeTags(trim($a->argv[1]));
        }
-       if (empty($user)) {
+       if (empty($nickname)) {
                $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
                if (!DBA::isResult($c)) {
-                       System::httpExit(401);
+                       throw new \Friendica\Network\HTTPException\ForbiddenException();
                }
                $system_mode = true;
        }
 
-       $format = defaults($_GET, 'format', 'json');
+       $format = ($_GET['format'] ?? '') ?: 'json';
 
        $justme = false;
        $global = false;
@@ -45,7 +46,7 @@ function poco_init(App $a) {
                $ret = PortableContact::serverlist();
                header('Content-type: application/json');
                echo json_encode($ret);
-               killme();
+               exit();
        }
 
        if ($a->argc > 1 && $a->argv[1] === '@global') {
@@ -69,10 +70,10 @@ function poco_init(App $a) {
        if (! $system_mode && ! $global) {
                $users = q("SELECT `user`.*,`profile`.`hide-friends` from user left join profile on `user`.`uid` = `profile`.`uid`
                        where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
-                       DBA::escape($user)
+                       DBA::escape($nickname)
                );
                if (! DBA::isResult($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
-                       System::httpExit(404);
+                       throw new \Friendica\Network\HTTPException\NotFoundException();
                }
 
                $user = $users[0];
@@ -87,7 +88,7 @@ function poco_init(App $a) {
        if (!empty($cid)) {
                $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid));
        }
-       if (x($_GET, 'updatedSince')) {
+       if (!empty($_GET['updatedSince'])) {
                $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
        }
        if ($global) {
@@ -121,7 +122,7 @@ function poco_init(App $a) {
        } else {
                $startIndex = 0;
        }
-       $itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);
+       $itemsPerPage = ((!empty($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
        if ($global) {
                Logger::log("Start global query", Logger::DEBUG);
@@ -163,13 +164,13 @@ function poco_init(App $a) {
        Logger::log("Query done", Logger::DEBUG);
 
        $ret = [];
-       if (x($_GET, 'sorted')) {
+       if (!empty($_GET['sorted'])) {
                $ret['sorted'] = false;
        }
-       if (x($_GET, 'filtered')) {
+       if (!empty($_GET['filtered'])) {
                $ret['filtered'] = false;
        }
-       if (x($_GET, 'updatedSince') && ! $global) {
+       if (!empty($_GET['updatedSince']) && ! $global) {
                $ret['updatedSince'] = false;
        }
        $ret['startIndex']   = (int) $startIndex;
@@ -195,7 +196,7 @@ function poco_init(App $a) {
                'generation' => false
        ];
 
-       if ((! x($_GET, 'fields')) || ($_GET['fields'] === '@all')) {
+       if (empty($_GET['fields']) || ($_GET['fields'] === '@all')) {
                foreach ($fields_ret as $k => $v) {
                        $fields_ret[$k] = true;
                }
@@ -370,20 +371,21 @@ function poco_init(App $a) {
                        $ret['entry'][] = [];
                }
        } else {
-               System::httpExit(500);
+               throw new \Friendica\Network\HTTPException\InternalServerErrorException();
        }
+
        Logger::log("End of poco", Logger::DEBUG);
 
        if ($format === 'xml') {
                header('Content-type: text/xml');
                echo Renderer::replaceMacros(Renderer::getMarkupTemplate('poco_xml.tpl'), XML::arrayEscape(['$response' => $ret]));
-               killme();
+               exit();
        }
        if ($format === 'json') {
                header('Content-type: application/json');
                echo json_encode($ret);
-               killme();
+               exit();
        } else {
-               System::httpExit(500);
+               throw new \Friendica\Network\HTTPException\InternalServerErrorException();
        }
 }