X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=0dfe4d67a9b61960623d963f0f58718ccbabe2be;hb=162f754e2d6dcec931b405fef0808ff5a3d3f574;hp=4213ec4b60d0055bf9877d8aa07818c70546e87d;hpb=709aac065240c6874ee9c428eebcc774c52df386;p=friendica.git

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 4213ec4b60..0dfe4d67a9 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -25,13 +25,20 @@ function dirfind_init(&$a) {
 function dirfind_content(&$a, $prefix = "") {
 
 	$community = false;
+	$discover_user = false;
 
 	$local = get_config('system','poco_local_search');
 
 	$search = $prefix.notags(trim($_REQUEST['search']));
 
-	if(strpos($search,'@') === 0)
+	if(strpos($search,'@') === 0) {
 		$search = substr($search,1);
+		if ((valid_email($search) AND validate_email($search)) OR
+			(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)));
+		}
+	}
 
 	if(strpos($search,'!') === 0) {
 		$search = substr($search,1);
@@ -42,7 +49,32 @@ function dirfind_content(&$a, $prefix = "") {
 
 	if($search) {
 
-		if ($local) {
+		if ($discover_user) {
+			$j = new stdClass();
+			$j->total = 1;
+			$j->items_page = 1;
+			$j->page = $a->pager['page'];
+
+			$objresult = new stdClass();
+			$objresult->cid = 0;
+			$objresult->name = $user_data["name"];
+			$objresult->addr = $user_data["addr"];
+			$objresult->url = $user_data["url"];
+			$objresult->photo = $user_data["photo"];
+			$objresult->tags = "";
+			$objresult->network = $user_data["network"];
+
+			$contact = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+					dbesc(normalise_link($user_data["url"])), intval(local_user()));
+			if ($contact)
+				$objresult->cid = $contact[0]["id"];
+
+
+			$j->results[] = $objresult;
+
+			poco_check($user_data["url"], $user_data["name"], $user_data["network"], $user_data["photo"],
+				"", "", "", "", "", datetime_convert(), 0);
+		} elseif ($local) {
 
 			if ($community)
 				$extra_sql = " AND `community`";
@@ -62,20 +94,26 @@ function dirfind_content(&$a, $prefix = "") {
 			else
 				$ostatus = NETWORK_DFRN;
 
-			$count = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND
-					(`url` REGEXP '%s' OR `name` REGEXP '%s' OR `location` REGEXP '%s' OR
-						`about` REGEXP '%s' OR `keywords` REGEXP '%s')".$extra_sql,
+			$count = q("SELECT count(*) AS `total` FROM `gcontact`
+					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
+						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` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
+						`gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql",
+					intval(local_user()), dbesc(CONTACT_IS_SHARING), dbesc(CONTACT_IS_FRIEND),
 					dbesc(NETWORK_DFRN), dbesc($ostatus), dbesc($diaspora),
 					dbesc(escape_tags($search)), dbesc(escape_tags($search)), dbesc(escape_tags($search)),
 					dbesc(escape_tags($search)), dbesc(escape_tags($search)));
 
-			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords`
+			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network`, `gcontact`.`keywords`, `gcontact`.`addr`
 					FROM `gcontact`
 					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
 						AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
 						AND NOT `contact`.`pending` AND `contact`.`rel` IN ('%s', '%s')
-					WHERE `gcontact`.`network` IN ('%s', '%s', '%s') AND
-					((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`)) AND
+					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` REGEXP '%s' OR `gcontact`.`name` REGEXP '%s' OR `gcontact`.`location` REGEXP '%s' OR
 						`gcontact`.`about` REGEXP '%s' OR `gcontact`.`keywords` REGEXP '%s') $extra_sql
 						GROUP BY `gcontact`.`nurl`
@@ -101,6 +139,7 @@ function dirfind_content(&$a, $prefix = "") {
 				$objresult = new stdClass();
 				$objresult->cid = $result["cid"];
 				$objresult->name = $result["name"];
+				$objresult->addr = $result["addr"];
 				$objresult->url = $result["url"];
 				$objresult->photo = $result["photo"];
 				$objresult->tags = $result["keywords"];
@@ -134,7 +173,9 @@ function dirfind_content(&$a, $prefix = "") {
 
 				$alt_text = "";
 
-				$itemurl = $jj->url;
+				$contact_details = get_contact_details_by_url($jj->url, local_user());
+
+				$itemurl = (($contact_details["addr"] != "") ? $contact_details["addr"] : $jj->url);
 
 				// If We already know this contact then don't show the "connect" button
 				if ($jj->cid > 0) {
@@ -167,6 +208,10 @@ function dirfind_content(&$a, $prefix = "") {
 					'conntxt' => $conntxt,
 					'connlnk' => $connlnk,
 					'photo_menu' => $photo_menu,
+					'details'       => $contact_details['location'],
+					'tags'          => $contact_details['keywords'],
+					'about'         => $contact_details['about'],
+					'account_type'  => (($contact_details['community']) ? t('Forum') : ''),
 					'network' => network_to_name($jj->network, $jj->url),
 					'id' => ++$id,
 				);