X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=ad1d403f4d7d31ce9bf89dff014f48293265e702;hb=df36ea0d03f3be20f1fc3a8706b696035e4010c6;hp=367438845427d420f9139fd64ee817044ca88404;hpb=1872cf2b2d14be5c4b8fbc9e2cf61f9fcd9e2f88;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 3674388454..ad1d403f4d 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -8,9 +8,13 @@ function directory_init(&$a) {
 
 		$a->page['aside'] .= findpeople_widget();
 
+		$a->page['aside'] .= follow_widget();
+
 	}
-	else
+	else {
 		unset($_SESSION['theme']);
+		unset($_SESSION['mobile-theme']);
+	}
 
 
 }
@@ -24,8 +28,12 @@ function directory_post(&$a) {
 
 
 function directory_content(&$a) {
+	global $db;
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	require_once("mod/proxy.php");
+
+	if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || 
+		(get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
@@ -38,49 +46,46 @@ function directory_content(&$a) {
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
-	$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="'
-		. zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
+	$gdirpath = '';
+	$dirurl = get_config('system','directory');
+	if(strlen($dirurl)) {
+		$gdirpath = zrl($dirurl,true);
 	}
 
-	$admin = '';
-
-	$o .= replace_macros($tpl, array(
-		'$search' => $search,
-		'$globaldir' => $globaldir,
-		'$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)
+	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) " : "");
+
+		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
+				(`user`.`nickname` LIKE '%$search%') OR
+				(`pdesc` LIKE '%$search%') OR
+				(`locality` LIKE '%$search%') OR
+				(`region` LIKE '%$search%') OR
+				(`country-name` LIKE '%$search%') OR
+				(`gender` LIKE '%$search%') OR
+				(`marital` LIKE '%$search%') OR
+				(`sexual` LIKE '%$search%') OR
+				(`about` LIKE '%$search%') OR
+				(`romance` LIKE '%$search%') OR
+				(`work` LIKE '%$search%') OR
+				(`education` LIKE '%$search%') OR
+				(`pub_keywords` LIKE '%$search%') OR
+				(`prv_keywords` LIKE '%$search%'))";
+	}
 
 	$publish = ((get_config('system','publish_all')) ? '' : " 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 ");
+	$r = $db->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']);
 
-	$order = " ORDER BY `name` ASC "; 
+	$order = " ORDER BY `name` ASC ";
 
+	$limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
 
-	$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'])
-	);
+	$r = $db->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 ".$limit);
 	if(count($r)) {
 
-		$tpl = get_markup_template('directory_item.tpl');
-
 		if(in_array('small', $a->argv))
 			$photo = 'thumb';
 		else
@@ -90,7 +95,7 @@ function directory_content(&$a) {
 
 
 			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-		
+
 			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
 			$details = '';
@@ -113,27 +118,90 @@ function directory_content(&$a) {
 			if(strlen($rr['gender']))
 				$details .= '<br />' . t('Gender: ') . $rr['gender'];
 
-			$entry = replace_macros($tpl,array(
-				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
-				'$photo' => $rr[$photo],
-				'$alt-text' => $rr['name'],
-				'$name' => $rr['name'],
-				'$details' => $pdesc . $details  
+			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);
+
+			if($a->theme['template_engine'] === 'internal') {
+				$location_e = template_escape($location);
+			}
+			else {
+				$location_e = $location;
+			}
+			
+			$photo_menu = array(array(t("View Profile"), zrl($profile_link)));
+
+			$entry = array(
+				'id' => $rr['id'],
+				'url' => $profile_link,
+				'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+				'img_hover' => $rr['name'],
+				'name' => $rr['name'],
+				'details' => $pdesc . $details,
+				'page_type' => $page_type,
+				'profile' => $profile,
+				'location' => $location_e,
+				'gender'   => $gender,
+				'pdesc'	=> $pdesc,
+				'marital'  => $marital,
+				'homepage' => $homepage,
+				'about' => $about,
+				'photo_menu' => $photo_menu,
+
+			);
 
 			$arr = array('contact' => $rr, 'entry' => $entry);
 
 			call_hooks('directory_item', $arr);
 
-			$o .= $entry;
+			unset($profile);
+			unset($location);
+
+			if(! $arr['entry'])
+				continue;
+
+			$entries[] = $arr['entry'];
 
 		}
 
-		$o .= "<div class=\"directory-end\" ></div>\r\n";
-		$o .= paginate($a);
+		$tpl = get_markup_template('directory_header.tpl');
+
+		$o .= replace_macros($tpl, array(
+			'$search' => $search,
+			'$globaldir' => t('Global Directory'),
+			'$gdirpath' => $gdirpath,
+			'$desc' => t('Find on this site'),
+			'$contacts' => $entries,
+			'$finding' => t('Finding:'),
+			'$findterm' => (strlen($search) ? $search : ""),
+			'$title' => t('Site Directory'),
+			'$submit' => t('Find'),
+			'$paginate' => paginate($a),
+		));
 
 	}
 	else