X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=04fb104de977894b2a9b586e1da657e7e79dda1d;hb=af6dbc654f82225cfc647fe2072662acae388e47;hp=884eca9a663d5426b49bd962d672f486352ed652;hpb=4e49939421d39dfa971d8744691568bcdbdca15e;p=friendica.git

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 884eca9a66..04fb104de9 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -1,18 +1,29 @@
 <?php
+/**
+ * @file mod/dirfind.php
+ */
 
 use Friendica\App;
+use Friendica\Content\ContactSelector;
+use Friendica\Content\Widget;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Network\Probe;
+use Friendica\Protocol\PortableContact;
+use Friendica\Util\Network;
 
-require_once 'include/contact_widgets.php';
-require_once 'include/probe.php';
-require_once 'include/socgraph.php';
-require_once 'include/Contact.php';
-require_once 'include/contact_selectors.php';
 require_once 'mod/contacts.php';
 
 function dirfind_init(App $a) {
 
 	if (! local_user()) {
-		notice( t('Permission denied.') . EOL );
+		notice(L10n::t('Permission denied.') . EOL );
 		return;
 	}
 
@@ -20,9 +31,9 @@ function dirfind_init(App $a) {
 		$a->page['aside'] = '';
 	}
 
-	$a->page['aside'] .= findpeople_widget();
+	$a->page['aside'] .= Widget::findPeople();
 
-	$a->page['aside'] .= follow_widget();
+	$a->page['aside'] .= Widget::follow();
 }
 
 function dirfind_content(App $a, $prefix = "") {
@@ -30,24 +41,24 @@ function dirfind_content(App $a, $prefix = "") {
 	$community = false;
 	$discover_user = false;
 
-	$local = get_config('system','poco_local_search');
+	$local = Config::get('system','poco_local_search');
 
 	$search = $prefix.notags(trim($_REQUEST['search']));
 
 	if (strpos($search,'@') === 0) {
 		$search = substr($search,1);
-		$header = sprintf( t('People Search - %s'), $search);
-		if ((valid_email($search) && validate_email($search)) ||
+		$header = L10n::t('People Search - %s', $search);
+		if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
 			(substr(normalise_link($search), 0, 7) == "http://")) {
-			$user_data = probe_url($search);
-			$discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
+			$user_data = Probe::uri($search);
+			$discover_user = (in_array($user_data["network"], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA]));
 		}
 	}
 
 	if (strpos($search,'!') === 0) {
 		$search = substr($search,1);
 		$community = true;
-		$header = sprintf( t('Forum Search - %s'), $search);
+		$header = L10n::t('Forum Search - %s', $search);
 	}
 
 	$o = '';
@@ -69,14 +80,14 @@ function dirfind_content(App $a, $prefix = "") {
 			$objresult->tags = "";
 			$objresult->network = $user_data["network"];
 
-			$contact = get_contact_details_by_url($user_data["url"], local_user());
+			$contact = Contact::getDetailsByURL($user_data["url"], local_user());
 			$objresult->cid = $contact["cid"];
 
 			$j->results[] = $objresult;
 
 			// Add the contact to the global contacts if it isn't already in our system
 			if (($contact["cid"] == 0) && ($contact["zid"] == 0) && ($contact["gid"] == 0)) {
-				update_gcontact($user_data);
+				GContact::update($user_data);
 			}
 		} elseif ($local) {
 
@@ -88,13 +99,13 @@ function dirfind_content(App $a, $prefix = "") {
 			$perpage = 80;
 			$startrec = (($a->pager['page']) * $perpage) - $perpage;
 
-			if (get_config('system','diaspora_enabled')) {
+			if (Config::get('system','diaspora_enabled')) {
 				$diaspora = NETWORK_DIASPORA;
 			} else {
 				$diaspora = NETWORK_DFRN;
 			}
 
-			if (!get_config('system','ostatus_disabled')) {
+			if (!Config::get('system','ostatus_disabled')) {
 				$ostatus = NETWORK_OSTATUS;
 			} else {
 				$ostatus = NETWORK_DFRN;
@@ -102,34 +113,24 @@ function dirfind_content(App $a, $prefix = "") {
 
 			$search2 = "%".$search."%";
 
-			/// @TODO These 2 SELECTs are not checked on validity with dbm::is_result()
+			/// @TODO These 2 SELECTs are not checked on validity with DBM::is_result()
 			$count = q("SELECT count(*) AS `total` FROM `gcontact`
-					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
-						AND `contact`.`network` = `gcontact`.`network`
-						AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
-						AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-					WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-					(`gcontact`.`url` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`location` LIKE '%s' OR
-						`gcontact`.`addr` LIKE '%s' OR `gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%s') $extra_sql",
-					intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+					WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND
+						((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
+						(`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
+						`addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql",
 					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
 					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
 					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)));
 
-			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
+			$results = q("SELECT `nurl`
 					FROM `gcontact`
-					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
-						AND `contact`.`network` = `gcontact`.`network`
-						AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
-						AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-					WHERE (`contact`.`id` > 0 OR (NOT `gcontact`.`hide` AND `gcontact`.`network` IN ('%s', '%s', '%s') AND
-					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)))) AND
-					(`gcontact`.`url` LIKE '%s' OR `gcontact`.`name` LIKE '%s' OR `gcontact`.`location` LIKE '%s' OR
-						`gcontact`.`addr` LIKE '%s' OR `gcontact`.`about` LIKE '%s' OR `gcontact`.`keywords` LIKE '%s') $extra_sql
-						GROUP BY `gcontact`.`nurl`
-						ORDER BY `gcontact`.`updated` DESC LIMIT %d, %d",
-					intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
+					WHERE NOT `hide` AND `network` IN ('%s', '%s', '%s') AND
+						((`last_contact` >= `last_failure`) OR (`updated` >= `last_failure`)) AND
+						(`url` LIKE '%s' OR `name` LIKE '%s' OR `location` LIKE '%s' OR
+						`addr` LIKE '%s' OR `about` LIKE '%s' OR `keywords` LIKE '%s') $extra_sql
+						GROUP BY `nurl`
+						ORDER BY `updated` DESC LIMIT %d, %d",
 					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
 					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
 					dbesc(escape_tags($search2)), dbesc(escape_tags($search2)), dbesc(escape_tags($search2)),
@@ -139,14 +140,21 @@ function dirfind_content(App $a, $prefix = "") {
 			$j->items_page = $perpage;
 			$j->page = $a->pager['page'];
 			foreach ($results AS $result) {
-				if (poco_alternate_ostatus_url($result["url"])) {
+				if (PortableContact::alternateOStatusUrl($result["nurl"])) {
 					continue;
 				}
 
-				$result = get_contact_details_by_url($result["url"], local_user(), $result);
+				$urlparts = parse_url($result["nurl"]);
+
+				// Ignore results that look strange.
+				// For historic reasons the gcontact table does contain some garbage.
+				if (!empty($urlparts['query']) || !empty($urlparts['fragment'])) {
+					continue;
+				}
+
+				$result = Contact::getDetailsByURL($result["nurl"], local_user());
 
 				if ($result["name"] == "") {
-					$urlparts = parse_url($result["url"]);
 					$result["name"] = end(explode("/", $urlparts["path"]));
 				}
 
@@ -163,13 +171,13 @@ function dirfind_content(App $a, $prefix = "") {
 			}
 
 			// Add found profiles from the global directory to the local directory
-			proc_run(PRIORITY_LOW, 'include/discover_poco.php', "dirsearch", urlencode($search));
+			Worker::add(PRIORITY_LOW, 'DiscoverPoCo', "dirsearch", urlencode($search));
 		} else {
 
 			$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
-			if(strlen(get_config('system','directory')))
-				$x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
+			if(strlen(Config::get('system','directory')))
+				$x = Network::fetchUrl(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
 			$j = json_decode($x);
 		}
@@ -179,7 +187,7 @@ function dirfind_content(App $a, $prefix = "") {
 			$a->set_pager_itemspage($j->items_page);
 		}
 
-		if (count($j->results)) {
+		if (!empty($j->results)) {
 
 			$id = 0;
 
@@ -187,7 +195,7 @@ function dirfind_content(App $a, $prefix = "") {
 
 				$alt_text = "";
 
-				$contact_details = get_contact_details_by_url($jj->url, local_user());
+				$contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
 				$itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
 
@@ -195,29 +203,28 @@ function dirfind_content(App $a, $prefix = "") {
 				if ($jj->cid > 0) {
 					$connlnk = "";
 					$conntxt = "";
-					$contact = q("SELECT * FROM `contact` WHERE `id` = %d",
-							intval($jj->cid));
-					if ($contact) {
-						$photo_menu = contact_photo_menu($contact[0]);
-						$details = _contact_detail_for_template($contact[0]);
+					$contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
+					if (DBM::is_result($contact)) {
+						$photo_menu = Contact::photoMenu($contact);
+						$details = _contact_detail_for_template($contact);
 						$alt_text = $details['alt_text'];
 					} else {
-						$photo_menu = array();
+						$photo_menu = [];
 					}
 				} else {
-					$connlnk = App::get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
-					$conntxt = t('Connect');
-					$photo_menu = array(
-						'profile' => array(t("View Profile"), zrl($jj->url)),
-						'follow' => array(t("Connect/Follow"), $connlnk)
-					);
+					$connlnk = System::baseUrl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
+					$conntxt = L10n::t('Connect');
+					$photo_menu = [
+						'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
+						'follow' => [L10n::t("Connect/Follow"), $connlnk]
+					];
 				}
 
 				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-				$entry = array(
+				$entry = [
 					'alt_text' => $alt_text,
-					'url' => zrl($jj->url),
+					'url' => Contact::magicLink($jj->url),
 					'itemurl' => $itemurl,
 					'name' => htmlentities($jj->name),
 					'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
@@ -228,23 +235,23 @@ function dirfind_content(App $a, $prefix = "") {
 					'details'       => $contact_details['location'],
 					'tags'          => $contact_details['keywords'],
 					'about'         => $contact_details['about'],
-					'account_type'  => account_type($contact_details),
-					'network' => network_to_name($jj->network, $jj->url),
+					'account_type'  => Contact::getAccountType($contact_details),
+					'network' => ContactSelector::networkToName($jj->network, $jj->url),
 					'id' => ++$id,
-				);
+				];
 				$entries[] = $entry;
 			}
 
 		$tpl = get_markup_template('viewcontact_template.tpl');
 
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl,[
 			'title' => $header,
 			'$contacts' => $entries,
 			'$paginate' => paginate($a),
-		));
+		]);
 
 		} else {
-			info( t('No matches') . EOL);
+			info(L10n::t('No matches') . EOL);
 		}
 
 	}