X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirfind.php;h=c2b18e3e24143d036d21545c3e3b9664d7f1b7cb;hb=7cf446835372eed5f73130e2f09a20308e4080c0;hp=0c2505361ee123f322508b6c2c2e036a6c384873;hpb=16da708e071bb2a41024c4268d963938f850dfb9;p=friendica.git

diff --git a/mod/dirfind.php b/mod/dirfind.php
index 0c2505361e..c2b18e3e24 100644
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -2,15 +2,22 @@
 require_once('include/contact_widgets.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(&$a) {
 
+	if(! local_user()) {
+		notice( t('Permission denied.') . EOL );
+		return;
+	}
+
 	if(! x($a->page,'aside'))
 		$a->page['aside'] = '';
 
-	$a->page['aside'] .= follow_widget();
-
 	$a->page['aside'] .= findpeople_widget();
+
+	$a->page['aside'] .= follow_widget();
 }
 
 
@@ -33,10 +40,6 @@ function dirfind_content(&$a, $prefix = "") {
 
 	$o = '';
 
-	$o .= replace_macros(get_markup_template("section_title.tpl"),array(
-		'$title' => sprintf( t('People Search - %s'), $search)
-	));
-
 	if($search) {
 
 		if ($local) {
@@ -56,7 +59,7 @@ function dirfind_content(&$a, $prefix = "") {
 					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`.`keywords`
+			$results = q("SELECT `contact`.`id` AS `cid`, `gcontact`.`url`, `gcontact`.`name`, `gcontact`.`photo`, `gcontact`.`network` , `gcontact`.`keywords`
 					FROM `gcontact`
 					LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl`
 						AND `contact`.`uid` = %d AND NOT `contact`.`blocked`
@@ -91,6 +94,7 @@ function dirfind_content(&$a, $prefix = "") {
 				$objresult->url = $result["url"];
 				$objresult->photo = $result["photo"];
 				$objresult->tags = $result["keywords"];
+				$objresult->network = $result["network"];
 
 				$j->results[] = $objresult;
 			}
@@ -116,38 +120,57 @@ function dirfind_content(&$a, $prefix = "") {
 
 			$id = 0;
 
-			$tpl = get_markup_template('match.tpl');
 			foreach($j->results as $jj) {
 
+				$alt_text = "";
+
+				$itemurl = $jj->url;
+
 				// If We already know this contact then don't show the "connect" button
 				if ($jj->cid > 0) {
 					$connlnk = "";
 					$conntxt = "";
 					$contact = q("SELECT * FROM `contact` WHERE `id` = %d",
 							intval($jj->cid));
-					if ($contact)
+					if ($contact) {
 						$photo_menu = contact_photo_menu($contact[0]);
-					else
+						$details = _contact_detail_for_template($contact[0]);
+						$alt_text = $details['alt_text'];
+					} else
 						$photo_menu = array();
 				} else {
 					$connlnk = $a->get_baseurl().'/follow/?url='.(($jj->connect) ? $jj->connect : $jj->url);
 					$conntxt = t('Connect');
-					$photo_menu = array(array(t("Connect/Follow"), $connlnk));
+					$photo_menu = array(array(t("View Profile"), zrl($jj->url)));
+					$photo_menu[] = array(t("Connect/Follow"), $connlnk);
 				}
 
 				$jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
 
-				$o .= replace_macros($tpl,array(
-					'$url' => zrl($jj->url),
-					'$name' => htmlentities($jj->name),
-					'$photo' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
-					'$tags' => $jj->tags,
-					'$conntxt' => $conntxt,
-					'$connlnk' => $connlnk,
-					'$photo_menu' => $photo_menu,
-					'$id' => ++$id,
-				));
+				$entry = array(
+					'alt_text' => $alt_text,
+					'url' => zrl($jj->url),
+					'itemurl' => $itemurl,
+					'name' => htmlentities($jj->name),
+					'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+					'img_hover' => $jj->tags,
+					'conntxt' => $conntxt,
+					'connlnk' => $connlnk,
+					'photo_menu' => $photo_menu,
+					'network' => network_to_name($jj->network, $jj->url),
+					'id' => ++$id,
+				);
+				$entries[] = $entry;
 			}
+
+		$tpl = get_markup_template('viewcontact_template.tpl');
+
+		$o .= replace_macros($tpl,array(
+			'title' => sprintf( t('People Search - %s'), $search),
+			'$contacts' => $entries,
+			'$paginate' => paginate($a),
+		));
+
 		}
 		else {
 			info( t('No matches') . EOL);
@@ -155,7 +178,5 @@ function dirfind_content(&$a, $prefix = "") {
 
 	}
 
-	$o .= '<div class="clear"></div>';
-	$o .= paginate($a);
 	return $o;
 }