X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=833a4f81cc0da7deb5c68b27c6997de2907b506d;hb=4b8f3a4194b8fbec19e8a085fcd16e9369fbfcd2;hp=0504ac321c1e80d667538895f0e3728dd420d948;hpb=b40281802ffce0b977cb0b1c4d02902ecf82e753;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 0504ac321c..833a4f81cc 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,6 +2,19 @@
 
 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']);
+		unset($_SESSION['mobile-theme']);
+	}
+
+
 }
 
 
@@ -13,34 +26,44 @@ function directory_post(&$a) {
 
 
 function directory_content(&$a) {
+
+	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'));
 	if(strlen($gdirpath)) {
 		$globaldir = '<ul><li><div id="global-directory-link"><a href="'
-		. $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
 	}
 
+	$admin = '';
+
 	$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`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+	$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 " );
 
@@ -49,16 +72,15 @@ function directory_content(&$a) {
 	if(count($r))
 		$a->set_pager_total($r[0]['total']);
 
+	$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` , `user`.`page-flags` 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');
-
 		if(in_array('small', $a->argv))
 			$photo = 'thumb';
 		else
@@ -86,25 +108,65 @@ function directory_content(&$a) {
 			}
 			if(strlen($rr['dob'])) {
 				if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-					$details .= "<br />Age: $years" ; 
+					$details .= '<br />' . t('Age: ') . $years ; 
 			}
 			if(strlen($rr['gender']))
-				$details .= '<br />Gender: ' . $rr['gender'];
+				$details .= '<br />' . t('Gender: ') . $rr['gender'];
+
+			if($rr['page-flags'] == PAGE_NORMAL)
+				$page_type = "Personal Profile";
+			if($rr['page-flags'] == PAGE_SOAPBOX)
+				$page_type = "Fan Page";
+			if($rr['page-flags'] == PAGE_COMMUNITY)
+				$page_type = "Community Forum";
+			if($rr['page-flags'] == PAGE_FREELOVE)
+				$page_type = "Open Forum";
+			if($rr['page-flags'] == PAGE_PRVGROUP)
+				$page_type = "Private Group";
+
+			$profile = $rr;
+
+			if((x($profile,'address') == 1)
+				|| (x($profile,'locality') == 1)
+				|| (x($profile,'region') == 1)
+				|| (x($profile,'postal-code') == 1)
+				|| (x($profile,'country-name') == 1))
+			$location = t('Location:');
+
+			$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+			$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+
+			$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+
+			$about = ((x($profile,'about') == 1) ?  t('About:') : False);
+			
+			$tpl = get_markup_template('directory_item.tpl');
 
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
 				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
+				'$photo' => $a->get_cached_avatar_image($rr[$photo]),
 				'$alt-text' => $rr['name'],
 				'$name' => $rr['name'],
-				'$details' => $pdesc . $details  
-
+				'$details' => $pdesc . $details,
+				'$page-type' => $page_type,
+				'$profile' => $profile,
+				'$location' => template_escape($location),
+				'$gender'   => $gender,
+				'$pdesc'	=> $pdesc,
+				'$marital'  => $marital,
+				'$homepage' => $homepage,
+				'$about' => $about,
 
 			));
 
 			$arr = array('contact' => $rr, 'entry' => $entry);
 
 			call_hooks('directory_item', $arr);
+			
+			unset($profile);
+			unset($location);
 
 			$o .= $entry;
 
@@ -115,7 +177,7 @@ function directory_content(&$a) {
 
 	}
 	else
-		notice("No entries (some entries may be hidden).");
+		info( t("No entries \x28some entries may be hidden\x29.") . EOL);
 
 	return $o;
-}
\ No newline at end of file
+}