X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=4223bb6ecd34bb3e196f9c1a62acbee7ab536810;hb=1ec5c6b2840cedbe21e089f4ef4404d22a65031e;hp=5a31ef9962ece4218731fcac754454a9eff2f4cd;hpb=ec02af593db87e78b0b388047ac4265aa5f987b1;p=friendica.git

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 5a31ef9962..4223bb6ecd 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -2,24 +2,29 @@
 /**
  * @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\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 use Friendica\Network\Probe;
-use Friendica\Object\Contact;
 use Friendica\Protocol\PortableContact;
+use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 
-require_once 'include/contact_widgets.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;
 	}
 
@@ -27,9 +32,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 = "") {
@@ -39,22 +44,24 @@ function dirfind_content(App $a, $prefix = "") {
 
 	$local = Config::get('system','poco_local_search');
 
-	$search = $prefix.notags(trim($_REQUEST['search']));
+	$search = $prefix.notags(trim(defaults($_REQUEST, 'search', '')));
+
+	$header = '';
 
 	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::uri($search);
-			$discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
+			$discover_user = (in_array($user_data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::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 = '';
@@ -78,12 +85,13 @@ function dirfind_content(App $a, $prefix = "") {
 
 			$contact = Contact::getDetailsByURL($user_data["url"], local_user());
 			$objresult->cid = $contact["cid"];
+			$objresult->pcid = $contact["zid"];
 
 			$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)) {
-				GlobalContact::update($user_data);
+				GContact::update($user_data);
 			}
 		} elseif ($local) {
 
@@ -96,69 +104,67 @@ function dirfind_content(App $a, $prefix = "") {
 			$startrec = (($a->pager['page']) * $perpage) - $perpage;
 
 			if (Config::get('system','diaspora_enabled')) {
-				$diaspora = NETWORK_DIASPORA;
+				$diaspora = Protocol::DIASPORA;
 			} else {
-				$diaspora = NETWORK_DFRN;
+				$diaspora = Protocol::DFRN;
 			}
 
 			if (!Config::get('system','ostatus_disabled')) {
-				$ostatus = NETWORK_OSTATUS;
+				$ostatus = Protocol::OSTATUS;
 			} else {
-				$ostatus = NETWORK_DFRN;
+				$ostatus = Protocol::DFRN;
 			}
 
 			$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 DBA::isResult()
 			$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),
-					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`
+					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",
+					DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)));
+
+			$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),
-					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)),
+					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",
+					DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
+					DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
 					intval($startrec), intval($perpage));
 			$j = new stdClass();
 			$j->total = $count[0]["total"];
 			$j->items_page = $perpage;
 			$j->page = $a->pager['page'];
 			foreach ($results AS $result) {
-				if (PortableContact::alternateOStatusUrl($result["url"])) {
+				if (PortableContact::alternateOStatusUrl($result["nurl"])) {
+					continue;
+				}
+
+				$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["url"], local_user(), $result);
+				$result = Contact::getDetailsByURL($result["nurl"], local_user());
 
 				if ($result["name"] == "") {
-					$urlparts = parse_url($result["url"]);
 					$result["name"] = end(explode("/", $urlparts["path"]));
 				}
 
 				$objresult = new stdClass();
 				$objresult->cid = $result["cid"];
+				$objresult->pcid = $result["zid"];
 				$objresult->name = $result["name"];
 				$objresult->addr = $result["addr"];
 				$objresult->url = $result["url"];
@@ -176,7 +182,7 @@ function dirfind_content(App $a, $prefix = "") {
 			$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
 
 			if(strlen(Config::get('system','directory')))
-				$x = fetch_url(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
+				$x = Network::fetchUrl(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
 
 			$j = json_decode($x);
 		}
@@ -186,7 +192,7 @@ function dirfind_content(App $a, $prefix = "") {
 			$a->set_pager_itemspage($j->items_page);
 		}
 
-		if (count($j->results)) {
+		if (!empty($j->results)) {
 
 			$id = 0;
 
@@ -202,32 +208,37 @@ 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::photoMenu($contact[0]);
-						$details = _contact_detail_for_template($contact[0]);
+					$contact = DBA::selectFirst('contact', [], ['id' => $jj->cid]);
+					if (DBA::isResult($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 = System::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='.(!empty($jj->connect) ? $jj->connect : $jj->url);
+					$conntxt = L10n::t('Connect');
+
+					$contact = DBA::selectFirst('contact', [], ['id' => $jj->pcid]);
+					if (DBA::isResult($contact)) {
+						$photo_menu = Contact::photoMenu($contact);
+					} else {
+						$photo_menu = [];
+					}
+
+					$photo_menu['profile'] = [L10n::t("View Profile"), Contact::magicLink($jj->url)];
+					$photo_menu['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),
+					'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
 					'img_hover' => $jj->tags,
 					'conntxt' => $conntxt,
 					'connlnk' => $connlnk,
@@ -236,22 +247,22 @@ function dirfind_content(App $a, $prefix = "") {
 					'tags'          => $contact_details['keywords'],
 					'about'         => $contact_details['about'],
 					'account_type'  => Contact::getAccountType($contact_details),
-					'network' => network_to_name($jj->network, $jj->url),
+					'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);
 		}
 
 	}