X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=ef77c9c99257181c03c28af696b7a78ba0627333;hb=221a659abeaf3bda3cefd88c80d1b7814f168f3e;hp=595a4bd2ee4affd4393642534c10f1d37f1b30d5;hpb=4dacd5db44532032b8572dac02bdc7a6c1133b88;p=friendica.git

diff --git a/mod/poco.php b/mod/poco.php
index 595a4bd2ee..ef77c9c992 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -1,12 +1,27 @@
 <?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\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -20,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();
 	}
 
@@ -28,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;
@@ -66,16 +80,11 @@ 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::selectFirst('owner-view', ['uid', 'nickname'], ['nickname' => $nickname, 'hide-friends' => false]);
+		if (!DBA::isResult($user)) {
 			throw new \Friendica\Network\HTTPException\NotFoundException();
 		}
-
-		$user = $users[0];
 	}
 
 	if ($justme) {
@@ -98,8 +107,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`)
@@ -111,9 +119,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'])) {
@@ -136,16 +144,7 @@ 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`.`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",
-			intval($startIndex),
-			intval($itemsPerPage)
-		);
+		$contacts = DBA::selectToArray('owner-view', [], ['net-publish' => true], ['limit' => [$startIndex, $itemsPerPage]]);
 	} else {
 		Logger::log("Start query for user " . $user['nickname'], Logger::DEBUG);
 		$contacts = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
@@ -188,7 +187,6 @@ function poco_init(App $a) {
 		'aboutMe' => false,
 		'currentLocation' => false,
 		'network' => false,
-		'gender' => false,
 		'tags' => false,
 		'address' => false,
 		'contactType' => false,
@@ -223,31 +221,6 @@ function poco_init(App $a) {
 					}
 				}
 
-				if (($contact['about'] == "") && isset($contact['pabout'])) {
-					$contact['about'] = $contact['pabout'];
-				}
-				if ($contact['location'] == "") {
-					if (isset($contact['plocation'])) {
-						$contact['location'] = $contact['plocation'];
-					}
-					if (isset($contact['pregion']) && ( $contact['pregion'] != "")) {
-						if ($contact['location'] != "") {
-							$contact['location'] .= ", ";
-						}
-						$contact['location'] .= $contact['pregion'];
-					}
-
-					if (isset($contact['pcountry']) && ( $contact['pcountry'] != "")) {
-						if ($contact['location'] != "") {
-							$contact['location'] .= ", ";
-						}
-						$contact['location'] .= $contact['pcountry'];
-					}
-				}
-
-				if (($contact['gender'] == "") && isset($contact['pgender'])) {
-					$contact['gender'] = $contact['pgender'];
-				}
 				if (($contact['keywords'] == "") && isset($contact['pub_keywords'])) {
 					$contact['keywords'] = $contact['pub_keywords'];
 				}
@@ -264,7 +237,6 @@ function poco_init(App $a) {
 				if ($contact['network'] == Protocol::DIASPORA) {
 					$contact['location'] = "";
 					$about = "";
-					$contact['gender'] = "";
 				}
 
 				$entry = [];
@@ -280,9 +252,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'];
 				}
@@ -343,21 +312,21 @@ function poco_init(App $a) {
 					$entry['address'] = [];
 
 					// Deactivated. It just reveals too much data. (Although its from the default profile)
-					//if (isset($rr['paddress']))
-					//	 $entry['address']['streetAddress'] = $rr['paddress'];
+					//if (isset($rr['address']))
+					//	 $entry['address']['streetAddress'] = $rr['address'];
 
-					if (isset($contact['plocation'])) {
-						$entry['address']['locality'] = $contact['plocation'];
+					if (isset($contact['locality'])) {
+						$entry['address']['locality'] = $contact['locality'];
 					}
-					if (isset($contact['pregion'])) {
-						$entry['address']['region'] = $contact['pregion'];
+					if (isset($contact['region'])) {
+						$entry['address']['region'] = $contact['region'];
 					}
 					// See above
-					//if (isset($rr['ppostalcode']))
-					//	 $entry['address']['postalCode'] = $rr['ppostalcode'];
+					//if (isset($rr['postal-code']))
+					//	 $entry['address']['postalCode'] = $rr['postal-code'];
 
-					if (isset($contact['pcountry'])) {
-						$entry['address']['country'] = $contact['pcountry'];
+					if (isset($contact['country'])) {
+						$entry['address']['country'] = $contact['country'];
 					}
 				}