Merge remote-tracking branch 'upstream/master'

1 files changed, 164 insertions, 120 deletions

diff --git a/mod/directory.php b/mod/directory.php
index c9332f447..b11b0d410 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,22 +1,14 @@
 <?php
 
 require_once('include/dir_fns.php');
+require_once('include/widgets.php');
 
 
 function directory_init(&$a) {
-	$a->set_pager_itemspage(60);
+	$a->set_pager_itemspage(80);
 
 }
 
-function directory_aside(&$a) {
-
-	if(local_user()) {
-		require_once('include/contact_widgets.php');
-		$a->set_widget('find_people',findpeople_widget());
-	}
-}
-
-
 function directory_content(&$a) {
 
 	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -24,6 +16,24 @@ function directory_content(&$a) {
 		return;
 	}
 
+	$safe_mode = 1;
+
+	$observer = get_observer_hash();
+	
+	if($observer) {
+		$safe_mode = get_xconfig($observer,'directory','safe_mode');
+	}
+	if($safe_mode === false)
+		$safe_mode = 1;
+	else
+		$safe_mode = intval($safe_mode);
+
+	if(x($_REQUEST,'safe'))
+		$safe_mode = (intval($_REQUEST['safe']));
+
+
+
+
 	$o = '';
 	nav_set_selected('directory');
 
@@ -32,154 +42,188 @@ function directory_content(&$a) {
 	else
 		$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
+	$advanced = ((x($_REQUEST,'query')) ? notags(trim($_REQUEST['query'])) : '');
 
-	$tpl = get_markup_template('directory_header.tpl');
+	$keywords = (($_GET['keywords']) ? $_GET['keywords'] : '');
 
+	$tpl = get_markup_template('directory_header.tpl');
 
+		
 	$dirmode = intval(get_config('system','directory_mode'));
 
-//	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
-//		$localdir = true;
-//		return;
-//	}
-
-// FIXME
-$localdir = true;
+	if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) {
+		$url = z_root() . '/dirsearch';
+	}
+	if(! $url) {
+		$directory = find_upstream_directory($dirmode);
+		$url = $directory['url'] . '/dirsearch';
+	}
 
+	logger('mod_directory: URL = ' . $url, LOGGER_DEBUG);
 
-	if(! $localdir) {
-		$directory = find_upstream_directory($dirmode);
+	$contacts = array();
 
-		if($directory) {
-			$url = $directory['url'];
-		}
-		else {
-			$url = DIRECTORY_FALLBACK_MASTER . '/post';
+	if(local_user()) {
+		$x = q("select abook_xchan from abook where abook_channel = %d",
+			intval(local_user())
+		);
+		if($x) {
+			foreach($x as $xx)
+				$contacts[] = $xx['abook_xchan'];
 		}
 	}
 
 
 
-	if($localdir) {
-		if($search)
-			$search = dbesc($search);
-		$sql_extra = ((strlen($search)) ? " AND MATCH ( xchan_name, xchan_addr, xprof_desc, xprof_locale, xprof_region, xprof_country, xprof_gender, xprof_marital ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
-
-		// group_concat(xtag_term separator ', ') as tags
-		$r = q("SELECT COUNT(xchan_hash) AS `total` FROM xchan left join xprof on xchan_hash = xprof_hash $sql_extra");
-		if($r)
-			$a->set_pager_total($r[0]['total']);
-
-		$order = " ORDER BY `xchan_name` ASC "; 
+	if($url) {
+		// We might want to make the tagadelic count (&kw=) configurable or turn it off completely.
 
+		$numtags = get_config('system','directorytags');
 
-		$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash $sql_extra $order LIMIT %d , %d ",
-			intval($a->pager['start']),
-			intval($a->pager['itemspage'])
-		);
+		$kw = ((intval($numtags)) ? $numtags : 24);
+		$query = $url . '?f=&kw=' . $kw . (($safe_mode != 1) ? '&safe=' . $safe_mode : '');
 
+		if($search)
+			$query .= '&name=' . urlencode($search) . '&keywords=' . urlencode($search);
+		if(strpos($search,'@'))
+			$query .= '&address=' . urlencode($search);
+		if($keywords)
+			$query .= '&keywords=' . urlencode($keywords);
+		if($advanced)
+			$query .= '&query=' . urlencode($advanced);
 
-		if($r) {
+		$sort_order  = ((x($_REQUEST,'order')) ? $_REQUEST['order'] : '');
+		if($sort_order)
+			$query .= '&order=' . urlencode($sort_order);
 
-			$entries = array();
+		if($a->pager['page'] != 1)
+			$query .= '&p=' . $a->pager['page'];
 
-			$photo = 'thumb';
+		logger('mod_directory: query: ' . $query);
 
-			foreach($r as $rr) {
+		$x = z_fetch_url($query);
+		logger('directory: return from upstream: ' . print_r($x,true), LOGGER_DATA);
 
-				$profile_link = chanlink_hash($rr['xchan_hash']);
-		
-				$pdesc = (($rr['xprof_desc']) ? $rr['xprof_desc'] . '<br />' : '');
-
-				$details = '';
-				if(strlen($rr['xprof_locale']))
-					$details .= $rr['xprof_locale'];
-				if(strlen($rr['xprof_region'])) {
-					if(strlen($rr['xprof_locale']))
-						$details .= ', ';
-					$details .= $rr['xprof_region'];
-				}
-				if(strlen($rr['xprof_country'])) {
-					if(strlen($details))
-						$details .= ', ';
-					$details .= $rr['xprof_country'];
-				}
-				if(strlen($rr['xprof_dob'])) {
-					if(($years = age($rr['xprof_dob'],'UTC','')) != 0)
-						$details .= '<br />' . t('Age: ') . $years ; 
-				}
-				if(strlen($rr['xprof_gender']))
-					$details .= '<br />' . t('Gender: ') . $rr['xprof_gender'];
+		if($x['success']) {
+			$t = 0;
+			$j = json_decode($x['body'],true);
+			if($j) {
 
-				$page_type = '';
+				if($j['results']) {
 
-				$profile = $rr;
+					$entries = array();
 
-				if ((x($profile,'xprof_locale') == 1)
-					|| (x($profile,'xprof_region') == 1)
-					|| (x($profile,'xprof_postcode') == 1)
-					|| (x($profile,'xprof_country') == 1))
-				$location = t('Location:');
+					$photo = 'thumb';
 
-				$gender = ((x($profile,'xprof_gender') == 1) ? t('Gender:') : False);
+					foreach($j['results'] as $rr) {
 
-				$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+						$profile_link = chanlink_url($rr['url']);
+		
+						$pdesc = (($rr['description']) ? $rr['description'] . '<br />' : '');
+						$connect_link = ((local_user()) ? z_root() . '/follow?f=&url=' . urlencode($rr['address']) : ''); 		
+
+						if(in_array($rr['hash'],$contacts))
+							$connect_link = '';
+
+						$details = '';
+						if(strlen($rr['locale']))
+							$details .= $rr['locale'];
+						if(strlen($rr['region'])) {
+							if(strlen($rr['locale']))
+								$details .= ', ';
+							$details .= $rr['region'];
+						}
+						if(strlen($rr['country'])) {
+							if(strlen($details))
+								$details .= ', ';
+							$details .= $rr['country'];
+						}
+						if(strlen($rr['birthday'])) {
+							if(($years = age($rr['birthday'],'UTC','')) != 0)
+								$details .= '<br />' . t('Age: ') . $years ; 
+						}
+						if(strlen($rr['gender']))
+							$details .= '<br />' . t('Gender: ') . $rr['gender'];
+
+						$page_type = '';
+
+						$profile = $rr;
+
+						if ((x($profile,'locale') == 1)
+							|| (x($profile,'region') == 1)
+							|| (x($profile,'postcode') == 1)
+							|| (x($profile,'country') == 1))
+						$location = t('Location:');
+
+						$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
 	
-				$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : 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);
-			
-				$t = 0;
-
-				$entry = array(
-					'id' => ++$t,
-					'profile_link' => $profile_link,
-					'photo' => $rr[xchan_photo_m],
-					'alttext' => $rr['xchan_name'],
-					'name' => $rr['xchan_name'],
-					'details' => $pdesc . $details,
-					'profile' => $profile,
-					'location' => $location,
-					'gender'   => $gender,
-					'pdesc'	=> $pdesc,
-					'marital'  => $marital,
-					'homepage' => $homepage,
-					'about' => $about,
-
-				);
-
-				$arr = array('contact' => $rr, 'entry' => $entry);
-
-				call_hooks('directory_item', $arr);
+						$about = ((x($profile,'about') == 1) ?  t('About:') : False);
 			
-				unset($profile);
-				unset($location);
 
-				$entries[] = $entry;
+						$entry = array(
+							'id' => ++$t,
+							'profile_link' => $profile_link,
+							'photo' => $rr['photo'],
+							'hash' => $rr['hash'],
+							'alttext' => $rr['name'] . ' ' . $rr['address'],
+							'name' => $rr['name'],
+							'details' => $pdesc . $details,
+							'profile' => $profile,
+							'address' =>  $rr['address'],
+							'location' => $location,
+							'gender'   => $gender,
+							'pdesc'	=> $pdesc,
+							'marital'  => $marital,
+							'homepage' => $homepage,
+							'about' => $about,
+							'conn_label' => t('Connect'),
+							'connect' => $connect_link,
+						);
+
+						$arr = array('contact' => $rr, 'entry' => $entry);
+
+						call_hooks('directory_item', $arr);
+			
+						$entries[] = $arr['entry'];
+						unset($profile);
+						unset($location);
 
-			}
 
-			logger('entries: ' . print_r($entries,true));
+					}
 
-			$o .= replace_macros($tpl, array(
-				'$search' => $search,
-				'$desc' => t('Find'),
-				'$finddsc' => t('Finding:'),
-				'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
-				'$entries' => $entries,
-				'$dirlbl' => t('Directory'),
-				'$submit' => t('Find')
-			));
+					if($j['keywords']) {
+						$a->data['directory_keywords'] = $j['keywords'];
+					}
 
+//					logger('mod_directory: entries: ' . print_r($entries,true), LOGGER_DATA);
 
-			$o .= paginate($a);
+					$o .= replace_macros($tpl, array(
+						'$search' => $search,
+						'$desc' => t('Find'),
+						'$finddsc' => t('Finding:'),
+						'$safetxt' => htmlspecialchars($search,ENT_QUOTES,'UTF-8'),
+						'$entries' => $entries,
+						'$dirlbl' => t('Directory'),
+						'$submit' => t('Find')
+					));
 
-		}
 
-	else
-		info( t("No entries (some entries may be hidden).") . EOL);
+					$o .= alt_pager($a,$j['records'], t('next page'), t('previous page'));
 
+				}
+				else {
+					if($a->pager['page'] == 1 && $j['records'] == 0 && strpos($search,'@')) {
+						goaway(z_root() . '/chanview/?f=&address=' . $search);
+					}
+					info( t("No entries (some entries may be hidden).") . EOL);
+				}
+			}
+		}
 	}
-
 	return $o;
 }
+