X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=703c08ce1bec37bfdd1add92c130fd5b812f05e4;hb=e59377d96b09c8d7bc0090ce2cea0e99517c7d9b;hp=2dd4b15d98b650b5604bd4cb7681bd7bf3f95590;hpb=a4850cb3d7886db727b4c98a98a94c51f008526f;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 2dd4b15d98..703c08ce1b 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -4,19 +4,29 @@ function directory_init(&$a) {
 }
 
 function directory_content(&$a) {
-dbg(2);
+	$o = '';
+	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
+
 	$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
 
-	$tpl .= file_get_contents('view/directory_header.tpl');
+	$tpl = load_view_file('view/directory_header.tpl');
 
-	$o .= replace_macros($tpl, array(
-		'$search' => $search
+	$globaldir = '';
+	$gdirpath = dirname(get_config('system','directory_submit_url'));
+	if(strlen($gdirpath)) {
+		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
+		. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+	}
 
+	$o .= replace_macros($tpl, array(
+		'$search' => $search,
+		'$globaldir' => $globaldir,
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")
 	));
 
 	if($search)
 		$search = dbesc($search);
-	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`employer`,`school`) 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`) 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 ");
@@ -31,7 +41,7 @@ dbg(2);
 	);
 	if(count($r)) {
 
-		$tpl = file_get_contents('view/directory_item.tpl');
+		$tpl = load_view_file('view/directory_item.tpl');
 
 		if(in_array('small', $a->argv))
 			$photo = 'thumb';
@@ -40,6 +50,7 @@ dbg(2);
 
 		foreach($r as $rr) {
 
+
 			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 			$details = '';
 			if(strlen($rr['locality']))