Merge pull request #6559 from tobiasd/20190130-admininiwarning

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 3456beb12896a4b2a507f365b28330d66ba76f54..064e0e9a85f919178aefcd6372a4092efd324a69 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -26,9 +26,9 @@ function poco_init(App $a) {
        }
 
        if ($a->argc > 1) {
-               $user = Strings::escapeTags(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);
@@ -46,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') {
@@ -70,7 +70,7 @@ 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);
@@ -378,12 +378,12 @@ function poco_init(App $a) {
        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);
        }