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

diff --git a/mod/poco.php b/mod/poco.php
index cbee264585..f04ec42790 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -1,17 +1,30 @@
 <?php
-
-// See here for a documentation for portable contacts:
-// https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
-
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * @see 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\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Protocol\PortableContact;
@@ -22,7 +35,7 @@ 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'))) {
+	if (intval(DI::config()->get('system', 'block_public')) || (DI::config()->get('system', 'block_local_dir'))) {
 		throw new \Friendica\Network\HTTPException\ForbiddenException();
 	}
 
@@ -30,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;
@@ -68,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' and `profile`.`is-default` = 1 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) {
@@ -100,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`)
@@ -113,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'])) {
@@ -139,12 +148,12 @@ function poco_init(App $a) {
 	} elseif ($system_mode) {
 		Logger::log("Start system mode query", Logger::DEBUG);
 		$contacts = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
-				`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
+				`profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
 				`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 `profile`.`is-default`
-			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)
 		);
@@ -190,7 +199,6 @@ function poco_init(App $a) {
 		'aboutMe' => false,
 		'currentLocation' => false,
 		'network' => false,
-		'gender' => false,
 		'tags' => false,
 		'address' => false,
 		'contactType' => false,
@@ -247,16 +255,13 @@ function poco_init(App $a) {
 					}
 				}
 
-				if (($contact['gender'] == "") && isset($contact['pgender'])) {
-					$contact['gender'] = $contact['pgender'];
-				}
 				if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) {
 					$contact['keywords'] = $contact['pub_keywords'];
 				}
 				if (isset($contact['account-type'])) {
 					$contact['contact-type'] = $contact['account-type'];
 				}
-				$about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
+				$about = DI::cache()->get("about:" . $contact['updated'] . ":" . $contact['nurl']);
 				if (is_null($about)) {
 					$about = BBCode::convert($contact['about'], false);
 					DI::cache()->set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
@@ -266,7 +271,6 @@ function poco_init(App $a) {
 				if ($contact['network'] == Protocol::DIASPORA) {
 					$contact['location'] = "";
 					$about = "";
-					$contact['gender'] = "";
 				}
 
 				$entry = [];
@@ -282,9 +286,6 @@ function poco_init(App $a) {
 				if ($fields_ret['currentLocation']) {
 					$entry['currentLocation'] = $contact['location'];
 				}
-				if ($fields_ret['gender']) {
-					$entry['gender'] = $contact['gender'];
-				}
 				if ($fields_ret['generation']) {
 					$entry['generation'] = (int)$contact['generation'];
 				}