X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpeoplesearch.php;h=4e0ec3f0c41d3db8baf61156908096e600222a4e;hb=147dd16ab3f1d03a6bee8b3c8bf93170acab4ba9;hp=a4e9308cf64ce59042929ef2baa005c021cb82f6;hpb=2d3ba299b86bca9e3a85d2abdd1921f969c9bfe1;p=quix0rs-gnu-social.git

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index a4e9308cf6..4e0ec3f0c4 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -19,61 +19,36 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define(PROFILES_PER_PAGE, 10);
+require_once(INSTALLDIR.'/lib/searchaction.php');
+define('PROFILES_PER_PAGE', 10);
 
-# XXX common parent for people and content search?
+class PeoplesearchAction extends SearchAction {
 
-class PeoplesearchAction extends Action {
-	
-	function handle($args) {
-		parent::handle($args);
-		$this->show_form();
+	function get_instructions() {
+		return _('Search for people on %%site.name%% by their name, location, or interests. ' .
+				  'Separate the terms by spaces; they must be 3 characters or more.');
 	}
 
-	function show_top($error=NULL) {
+	function get_title() {
+		return _('People search');
 	}
-	
-	function show_form($error=NULL) {
-		$q = $this->trimmed('q');
-		$page = $this->trimmed('page', 1);
-		
-		common_show_header(_t('Find people'), NULL, $error, array($this, 'show_top'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'login',
-										   'action' => common_local_url('peoplesearch')));
-		common_element_start('p');
-		common_element('input', array('name' => 'q',
-									  'id' => 'q',
-									  'type' => 'text',
-									  'class' => 'input_text',
-									  'value' => ($q) ? $q : ''));
-		common_text(' ');
-		common_element('input', array('type' => 'submit',
-									  'id' => 'search',
-									  'name' => 'search',
-									  'class' => 'submit',
-									  'value' => _t('Search')));
-					   
-		common_element_end('p');
-		common_element_end('form');
-		if ($q) {
-			common_element('hr');
-			$this->show_results($q, $page);
-		}
-		common_show_footer();
-	}
-	
+
 	function show_results($q, $page) {
-		
+
 		$profile = new Profile();
 
 		# lcase it for comparison
 		$q = strtolower($q);
-		$profile->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' . 
+
+		if(common_config('db','type')=='mysql') {
+			$profile->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' .
 						   'against (\''.addslashes($q).'\')');
+		} else {
+			$profile->whereAdd('textsearch @@ plainto_tsquery(\''.addslashes($q).'\')');
+		}
 
 		# Ask for an extra to see if there's more.
-		
+
 		$profile->limit((($page-1)*PROFILES_PER_PAGE), PROFILES_PER_PAGE + 1);
 
 		$cnt = $profile->find();
@@ -90,12 +65,14 @@ class PeoplesearchAction extends Action {
 				}
 			}
 			common_element_end('ul');
+		} else {
+			common_element('p', 'error', _('No results'));
 		}
-		
+
 		common_pagination($page > 1, $cnt > PROFILES_PER_PAGE,
 						  $page, 'peoplesearch', array('q' => $q));
 	}
-	
+
 	function show_profile($profile, $terms) {
 		common_element_start('li', array('class' => 'profile_single',
 										 'id' => 'profile-' . $profile->id));
@@ -109,21 +86,32 @@ class PeoplesearchAction extends Action {
 									($profile->fullname) ? $profile->fullname :
 									$profile->nickname));
 		common_element_end('a');
+		common_element_start('p');
 		common_element_start('a', array('href' => $profile->profileurl,
 										'class' => 'nickname'));
 		common_raw($this->highlight($profile->nickname, $terms));
 		common_element_end('a');
 		if ($profile->fullname) {
-			common_element_start('p', 'fullname');
+			common_text(' | ');
+			common_element_start('span', 'fullname');
 			common_raw($this->highlight($profile->fullname, $terms));
-			common_element_end('p');
+			common_element_end('span');
 		}
 		if ($profile->location) {
-			common_element_start('p', 'location');
+			common_text(' | ');
+			common_element_start('span', 'location');
 			common_raw($this->highlight($profile->location, $terms));
+			common_element_end('span');
+		}
+		common_element_end('p');
+		if ($profile->homepage) {
+			common_element_start('p', 'website');
+			common_element_start('a', array('href' => $profile->homepage));
+			common_raw($this->highlight($profile->homepage, $terms));
+			common_element_end('a');
 			common_element_end('p');
 		}
-		if ($profile->location) {
+		if ($profile->bio) {
 			common_element_start('p', 'bio');
 			common_raw($this->highlight($profile->bio, $terms));
 			common_element_end('p');
@@ -132,8 +120,9 @@ class PeoplesearchAction extends Action {
 	}
 
 	function highlight($text, $terms) {
-		$pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/';
-		$result = preg_replace($pattern, '<strong>\\1</strong>', $text);
+		$terms = array_map('preg_quote', array_map('htmlspecialchars', $terms));
+		$pattern = '/('.implode('|',$terms).')/i';
+		$result = preg_replace($pattern, '<strong>\\1</strong>', htmlspecialchars($text));
 		return $result;
 	}
 }