X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=f04ec42790f1a08b37fdd80dc2122ce07a331cdb;hb=472518f0b5117362bcf5c49dbaa36095820986a3;hp=802824ee5f0de4ff2e64371b135250d69f2fb152;hpb=fc9865176e4358c12a41370768632f0a8db3e655;p=friendica.git

diff --git a/mod/poco.php b/mod/poco.php
index 802824ee5f..f04ec42790 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -43,8 +43,7 @@ function poco_init(App $a) {
 		$nickname = Strings::escapeTags(trim($a->argv[1]));
 	}
 	if (empty($nickname)) {
-		$c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-		if (!DBA::isResult($c)) {
+		if (!DBA::exists('profile', ['net-publish' => true])) {
 			throw new \Friendica\Network\HTTPException\ForbiddenException();
 		}
 		$system_mode = true;
@@ -81,16 +80,14 @@ function poco_init(App $a) {
 		$cid = intval($a->argv[4]);
 	}
 
-	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' limit 1",
-			DBA::escape($nickname)
-		);
-		if (! DBA::isResult($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
+	if (!$system_mode && !$global) {
+		$user = DBA::fetchFirst("SELECT `user`.`uid`, `user`.`nickname` FROM `user`
+			INNER JOIN `profile` ON `user`.`uid` = `profile`.`uid`
+			WHERE `user`.`nickname` = ? AND NOT `profile`.`hide-friends`",
+			$nickname);
+		if (!DBA::isResult($user)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
-
-		$user = $users[0];
 	}
 
 	if ($justme) {
@@ -113,8 +110,7 @@ function poco_init(App $a) {
 			DBA::escape(Protocol::OSTATUS)
 		);
 	} elseif ($system_mode) {
-		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `self` = 1
-			AND `uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) ");
+		$totalResults = DBA::count('profile', ['net-publish' => true]);
 	} else {
 		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
 			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
@@ -126,9 +122,9 @@ function poco_init(App $a) {
 			DBA::escape(Protocol::STATUSNET)
 		);
 	}
-	if (DBA::isResult($contacts)) {
+	if (empty($totalResults) && DBA::isResult($contacts)) {
 		$totalResults = intval($contacts[0]['total']);
-	} else {
+	} elseif (empty($totalResults)) {
 		$totalResults = 0;
 	}
 	if (!empty($_GET['startIndex'])) {
@@ -156,8 +152,8 @@ function poco_init(App $a) {
 				`profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
 			FROM `contact` INNER JOIN `profile` ON `profile`.`uid` = `contact`.`uid`
 				INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-			WHERE `self` = 1
-			AND `contact`.`uid` IN (SELECT `uid` FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1) LIMIT %d, %d",
+			WHERE `self` = 1 AND `profile`.`net-publish`
+			LIMIT %d, %d",
 			intval($startIndex),
 			intval($itemsPerPage)
 		);