X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=5f00b4f5a4a9ced5703cf8f26cd22cdb9f82390d;hb=a1a07e7287e9e764912bbd08383cf43503deb9e8;hp=72c30fb3178da115b97d58b968c00fd74bdf6c02;hpb=067626380db6d5ed71d68bd91481ff51cfa76915;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 72c30fb317..5f00b4f5a4 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,6 +2,17 @@
 
 function directory_init(&$a) {
 	$a->set_pager_itemspage(60);
+
+	if(local_user()) {
+		require_once('include/contact_widgets.php');
+
+		$a->page['aside'] .= findpeople_widget();
+
+	}
+	else
+		unset($_SESSION['theme']);
+
+
 }
 
 
@@ -13,17 +24,23 @@ function directory_post(&$a) {
 
 
 function directory_content(&$a) {
+
+	$everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+		notice( t('Public access denied.') . EOL);
+		return;
+	}
+
 	$o = '';
-	$o .= '<script>	$(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
-	if(x($_SESSION,'theme'))
-		unset($_SESSION['theme']);
+	nav_set_selected('directory');
 
 	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 = get_markup_template('directory_header.tpl');
 
 	$globaldir = '';
 	$gdirpath = dirname(get_config('system','directory_submit_url'));
@@ -32,32 +49,48 @@ function directory_content(&$a) {
 		. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
 	}
 
+	$admin = '';
+	if(is_site_admin()) {
+		if($everything)
+			$admin =  '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory' . '">' . t('Normal site view') . '</a></div></li></ul>';
+		else
+			$admin = '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory/all' . '">' . t('Admin - View all site entries') . '</a></div></li></ul>';
+	}
+
 	$o .= replace_macros($tpl, array(
 		'$search' => $search,
 		'$globaldir' => $globaldir,
-		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "")
+		'$desc' => t('Find on this site'),
+		'$admin' => $admin,
+		'$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
+		'$sitedir' => t('Site Directory'),
+		'$submit' => t('Find')
 	));
 
 	if($search)
 		$search = dbesc($search);
 	$sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
-	$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+	$publish = ((get_config('system','publish_all') || $everything) ? '' : " AND `publish` = 1 " );
 
 
 	$r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
+	if($everything)
+		$order = " ORDER BY `register_date` DESC ";
+	else
+		$order = " ORDER BY `name` ASC "; 
 
 
-	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
 	);
 	if(count($r)) {
 
-		$tpl = load_view_file('view/directory_item.tpl');
+		$tpl = get_markup_template('directory_item.tpl');
 
 		if(in_array('small', $a->argv))
 			$photo = 'thumb';
@@ -115,7 +148,7 @@ function directory_content(&$a) {
 
 	}
 	else
-		notice( t("No entries \x28some entries may be hidden\x29.") . EOL);
+		info( t("No entries \x28some entries may be hidden\x29.") . EOL);
 
 	return $o;
-}
\ No newline at end of file
+}