X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=062aae516f91816c08e1776b4a1b5930e79ec647;hb=bf60ec070bb5af0eb1d37772cfdacda4f9c39a19;hp=01cb1a3ffb03db1524fb2c3b698e4372bdbb8d44;hpb=0ebd4aa78303792a97c111229080224ba1bcf2de;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 01cb1a3ffb..062aae516f 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -3,12 +3,24 @@ function directory_init(&$a) {
 	$a->set_pager_itemspage(60);
 }
 
+
+function directory_post(&$a) {
+	if(x($_POST,'search'))
+		$a->data['search'] = $_POST['search'];
+}
+
+
+
 function directory_content(&$a) {
+	$o = '';
 	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
 
-	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+	if(x($a->data,'search'))
+		$search = notags(trim($a->data['search']));
+	else
+		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	$tpl .= load_view_file('view/directory_header.tpl');
+	$tpl = load_view_file('view/directory_header.tpl');
 
 	$globaldir = '';
 	$gdirpath = dirname(get_config('system','directory_submit_url'));
@@ -25,7 +37,7 @@ function directory_content(&$a) {
 
 	if($search)
 		$search = dbesc($search);
-	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ");
@@ -71,7 +83,7 @@ function directory_content(&$a) {
 			if(strlen($rr['gender']))
 				$details .= '<br />Gender: ' . $rr['gender'];
 
-			$o .= replace_macros($tpl,array(
+			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
 				'$profile-link' => $profile_link,
 				'$photo' => $rr[$photo],
@@ -82,7 +94,14 @@ function directory_content(&$a) {
 
 			));
 
+			$arr = array('contact' => $rr, 'entry' => $entry);
+
+			call_hooks('directory_item', $arr);
+
+			$o .= $entry;
+
 		}
+
 		$o .= "<div class=\"directory-end\" ></div>\r\n";
 		$o .= paginate($a);