X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=064e0e9a85f919178aefcd6372a4092efd324a69;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=0a369502d319a64441e8aae52a289ac4845f3816;hpb=a0f65ca7a1b1fbc1a2d0f823940211377fc6e13e;p=friendica.git

diff --git a/mod/poco.php b/mod/poco.php
index 0a369502d3..064e0e9a85 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -26,9 +26,9 @@ function poco_init(App $a) {
 	}
 
 	if ($a->argc > 1) {
-		$user = Strings::removeTags(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);
@@ -88,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) {
@@ -122,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);
@@ -164,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;
@@ -196,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;
 		}
@@ -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);
 	}