X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=bfa4957f1435329255fbbc73bcf026a70bef3096;hb=a7d75702cc43b13b6100d993df6d8d409e5e2351;hp=595a4bd2ee4affd4393642534c10f1d37f1b30d5;hpb=7db4c7ea02cdf2c5a1a6e6314aebf206ca25319f;p=friendica.git

diff --git a/mod/poco.php b/mod/poco.php
index 595a4bd2ee..bfa4957f14 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -1,18 +1,33 @@
 <?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;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Protocol\PortableContact;
+use Friendica\Model\GServer;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
@@ -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;
@@ -42,16 +56,15 @@ function poco_init(App $a) {
 
 	if ($a->argc > 1 && $a->argv[1] === '@server') {
 		// List of all servers that this server knows
-		$ret = PortableContact::serverlist();
+		$ret = GServer::getActive();
 		header('Content-type: application/json');
 		echo json_encode($ret);
 		exit();
 	}
 
 	if ($a->argc > 1 && $a->argv[1] === '@global') {
-		// List of all profiles that this server recently had data from
-		$global = true;
-		$update_limit = date(DateTimeFormat::MYSQL, time() - 30 * 86400);
+		// Global is not supported anymore
+		throw new \Friendica\Network\HTTPException\NotFoundException();
 	}
 	if ($a->argc > 2 && $a->argv[2] === '@me') {
 		$justme = true;
@@ -66,16 +79,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) {
@@ -90,19 +98,11 @@ function poco_init(App $a) {
 	if (!empty($_GET['updatedSince'])) {
 		$update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince']));
 	}
-	if ($global) {
-		$contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')",
-			DBA::escape($update_limit),
-			DBA::escape(Protocol::DFRN),
-			DBA::escape(Protocol::DIASPORA),
-			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) ");
+	if ($system_mode) {
+		$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`)
+		$contacts = q("SELECT count(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `unsearchable` AND NOT `archive`
+			AND NOT `failed`
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra",
 			intval($user['uid']),
 			DBA::escape(Protocol::DFRN),
@@ -111,9 +111,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'])) {
@@ -123,33 +123,13 @@ function poco_init(App $a) {
 	}
 	$itemsPerPage = ((!empty($_GET['count'])) ? intval($_GET['count']) : $totalResults);
 
-	if ($global) {
-		Logger::log("Start global query", Logger::DEBUG);
-		$contacts = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
-			ORDER BY `updated` DESC LIMIT %d, %d",
-			DBA::escape($update_limit),
-			DBA::escape(Protocol::DFRN),
-			DBA::escape(Protocol::DIASPORA),
-			DBA::escape(Protocol::OSTATUS),
-			intval($startIndex),
-			intval($itemsPerPage)
-		);
-	} elseif ($system_mode) {
+	if ($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
-			AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
+		$contacts = q("SELECT * FROM `contact` WHERE `uid` = %d AND NOT `blocked` AND NOT `pending` AND NOT `hidden` AND NOT `archive`
+			AND NOT `failed` AND NOT `unsearchable`
 			AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
 			intval($user['uid']),
 			DBA::escape(Protocol::DFRN),
@@ -188,7 +168,6 @@ function poco_init(App $a) {
 		'aboutMe' => false,
 		'currentLocation' => false,
 		'network' => false,
-		'gender' => false,
 		'tags' => false,
 		'address' => false,
 		'contactType' => false,
@@ -206,171 +185,142 @@ function poco_init(App $a) {
 		}
 	}
 
-	if (is_array($contacts)) {
-		if (DBA::isResult($contacts)) {
-			foreach ($contacts as $contact) {
-				if (!isset($contact['updated'])) {
-					$contact['updated'] = '';
-				}
+	if (!is_array($contacts)) {
+		throw new \Friendica\Network\HTTPException\InternalServerErrorException();
+	}
 
-				if (! isset($contact['generation'])) {
-					if ($global) {
-						$contact['generation'] = 3;
-					} elseif ($system_mode) {
-						$contact['generation'] = 1;
-					} else {
-						$contact['generation'] = 2;
-					}
-				}
+	if (DBA::isResult($contacts)) {
+		foreach ($contacts as $contact) {
+			if (!isset($contact['updated'])) {
+				$contact['updated'] = '';
+			}
 
-				if (($contact['about'] == "") && isset($contact['pabout'])) {
-					$contact['about'] = $contact['pabout'];
+			if (! isset($contact['generation'])) {
+				if ($global) {
+					$contact['generation'] = 3;
+				} elseif ($system_mode) {
+					$contact['generation'] = 1;
+				} else {
+					$contact['generation'] = 2;
 				}
-				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['keywords'] == "") && isset($contact['pub_keywords'])) {
+				$contact['keywords'] = $contact['pub_keywords'];
+			}
+			if (isset($contact['account-type'])) {
+				$contact['contact-type'] = $contact['account-type'];
+			}
+			$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);
+			}
 
-				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 = 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);
-				}
+			// Non connected persons can only see the keywords of a Diaspora account
+			if ($contact['network'] == Protocol::DIASPORA) {
+				$contact['location'] = "";
+				$about = "";
+			}
 
-				// Non connected persons can only see the keywords of a Diaspora account
-				if ($contact['network'] == Protocol::DIASPORA) {
-					$contact['location'] = "";
-					$about = "";
-					$contact['gender'] = "";
+			$entry = [];
+			if ($fields_ret['id']) {
+				$entry['id'] = (int)$contact['id'];
+			}
+			if ($fields_ret['displayName']) {
+				$entry['displayName'] = $contact['name'];
+			}
+			if ($fields_ret['aboutMe']) {
+				$entry['aboutMe'] = $about;
+			}
+			if ($fields_ret['currentLocation']) {
+				$entry['currentLocation'] = $contact['location'];
+			}
+			if ($fields_ret['generation']) {
+				$entry['generation'] = (int)$contact['generation'];
+			}
+			if ($fields_ret['urls']) {
+				$entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']];
+				if ($contact['addr'] && ($contact['network'] !== Protocol::MAIL)) {
+					$entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'];
 				}
+			}
+			if ($fields_ret['preferredUsername']) {
+				$entry['preferredUsername'] = $contact['nick'];
+			}
+			if ($fields_ret['updated']) {
+				if (! $global) {
+					$entry['updated'] = $contact['success_update'];
 
-				$entry = [];
-				if ($fields_ret['id']) {
-					$entry['id'] = (int)$contact['id'];
-				}
-				if ($fields_ret['displayName']) {
-					$entry['displayName'] = $contact['name'];
-				}
-				if ($fields_ret['aboutMe']) {
-					$entry['aboutMe'] = $about;
-				}
-				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'];
-				}
-				if ($fields_ret['urls']) {
-					$entry['urls'] = [['value' => $contact['url'], 'type' => 'profile']];
-					if ($contact['addr'] && ($contact['network'] !== Protocol::MAIL)) {
-						$entry['urls'][] = ['value' => 'acct:' . $contact['addr'], 'type' => 'webfinger'];
+					if ($contact['name-date'] > $entry['updated']) {
+						$entry['updated'] = $contact['name-date'];
 					}
-				}
-				if ($fields_ret['preferredUsername']) {
-					$entry['preferredUsername'] = $contact['nick'];
-				}
-				if ($fields_ret['updated']) {
-					if (! $global) {
-						$entry['updated'] = $contact['success_update'];
-
-						if ($contact['name-date'] > $entry['updated']) {
-							$entry['updated'] = $contact['name-date'];
-						}
-						if ($contact['uri-date'] > $entry['updated']) {
-							$entry['updated'] = $contact['uri-date'];
-						}
-						if ($contact['avatar-date'] > $entry['updated']) {
-							$entry['updated'] = $contact['avatar-date'];
-						}
-					} else {
-						$entry['updated'] = $contact['updated'];
+					if ($contact['uri-date'] > $entry['updated']) {
+						$entry['updated'] = $contact['uri-date'];
+					}
+					if ($contact['avatar-date'] > $entry['updated']) {
+						$entry['updated'] = $contact['avatar-date'];
 					}
-					$entry['updated'] = date("c", strtotime($entry['updated']));
+				} else {
+					$entry['updated'] = $contact['updated'];
 				}
-				if ($fields_ret['photos']) {
-					$entry['photos'] = [['value' => $contact['photo'], 'type' => 'profile']];
+				$entry['updated'] = date("c", strtotime($entry['updated']));
+			}
+			if ($fields_ret['photos']) {
+				$entry['photos'] = [['value' => $contact['photo'], 'type' => 'profile']];
+			}
+			if ($fields_ret['network']) {
+				$entry['network'] = $contact['network'];
+				if ($entry['network'] == Protocol::STATUSNET) {
+					$entry['network'] = Protocol::OSTATUS;
 				}
-				if ($fields_ret['network']) {
-					$entry['network'] = $contact['network'];
-					if ($entry['network'] == Protocol::STATUSNET) {
-						$entry['network'] = Protocol::OSTATUS;
-					}
-					if (($entry['network'] == "") && ($contact['self'])) {
-						$entry['network'] = Protocol::DFRN;
-					}
+				if (($entry['network'] == "") && ($contact['self'])) {
+					$entry['network'] = Protocol::DFRN;
 				}
-				if ($fields_ret['tags']) {
-					$tags = str_replace(",", " ", $contact['keywords']);
-					$tags = explode(" ", $tags);
-
-					$cleaned = [];
-					foreach ($tags as $tag) {
-						$tag = trim(strtolower($tag));
-						if ($tag != "") {
-							$cleaned[] = $tag;
-						}
+			}
+			if ($fields_ret['tags']) {
+				$tags = str_replace(",", " ", $contact['keywords']);
+				$tags = explode(" ", $tags);
+
+				$cleaned = [];
+				foreach ($tags as $tag) {
+					$tag = trim(strtolower($tag));
+					if ($tag != "") {
+						$cleaned[] = $tag;
 					}
-
-					$entry['tags'] = [$cleaned];
 				}
-				if ($fields_ret['address']) {
-					$entry['address'] = [];
 
-					// Deactivated. It just reveals too much data. (Although its from the default profile)
-					//if (isset($rr['paddress']))
-					//	 $entry['address']['streetAddress'] = $rr['paddress'];
+				$entry['tags'] = [$cleaned];
+			}
+			if ($fields_ret['address']) {
+				$entry['address'] = [];
 
-					if (isset($contact['plocation'])) {
-						$entry['address']['locality'] = $contact['plocation'];
-					}
-					if (isset($contact['pregion'])) {
-						$entry['address']['region'] = $contact['pregion'];
-					}
-					// See above
-					//if (isset($rr['ppostalcode']))
-					//	 $entry['address']['postalCode'] = $rr['ppostalcode'];
+				// Deactivated. It just reveals too much data. (Although its from the default profile)
+				//if (isset($rr['address']))
+				//	 $entry['address']['streetAddress'] = $rr['address'];
 
-					if (isset($contact['pcountry'])) {
-						$entry['address']['country'] = $contact['pcountry'];
-					}
+				if (isset($contact['locality'])) {
+					$entry['address']['locality'] = $contact['locality'];
 				}
+				if (isset($contact['region'])) {
+					$entry['address']['region'] = $contact['region'];
+				}
+				// See above
+				//if (isset($rr['postal-code']))
+				//	 $entry['address']['postalCode'] = $rr['postal-code'];
 
-				if ($fields_ret['contactType']) {
-					$entry['contactType'] = intval($contact['contact-type']);
+				if (isset($contact['country'])) {
+					$entry['address']['country'] = $contact['country'];
 				}
-				$ret['entry'][] = $entry;
 			}
-		} else {
-			$ret['entry'][] = [];
+
+			if ($fields_ret['contactType']) {
+				$entry['contactType'] = intval($contact['contact-type']);
+			}
+			$ret['entry'][] = $entry;
 		}
 	} else {
-		throw new \Friendica\Network\HTTPException\InternalServerErrorException();
+		$ret['entry'][] = [];
 	}
 
 	Logger::log("End of poco", Logger::DEBUG);