X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpeoplesearch.php;h=2e54233ec1c607bb2f112809feec616c0064b450;hb=c3f2d195f934c4deff91d30640ec703cb576e55d;hp=644f0a7f7f8c14a153d6dbfda8a45781bc4d2fb4;hpb=573de867aa97aa70c28b07a805496de23460cb39;p=quix0rs-gnu-social.git

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 644f0a7f7f..2e54233ec1 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -20,103 +20,65 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/searchaction.php');
-define(PROFILES_PER_PAGE, 10);
+require_once(INSTALLDIR.'/lib/profilelist.php');
 
 class PeoplesearchAction extends SearchAction {
-	
+
 	function get_instructions() {
-		return _t('Search for people on %%site.name%% by their name, location, or interests. ' . 
+		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 get_title() {
-		return _t('People search');
+		return _('People search');
 	}
-	
+
 	function show_results($q, $page) {
-		
+
 		$profile = new Profile();
 
 		# lcase it for comparison
 		$q = strtolower($q);
-		$profile->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' . 
-						   'against (\''.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();
+        $search_engine = $profile->getSearchEngine('identica_people');
 
+        $search_engine->set_sort_mode('chron');
+		# Ask for an extra to see if there's more.
+        $search_engine->limit((($page-1)*PROFILES_PER_PAGE), PROFILES_PER_PAGE + 1);
+        if (false === $search_engine->query($q)) {
+            $cnt = 0;
+        }
+        else {
+		    $cnt = $profile->find();
+        }
 		if ($cnt > 0) {
 			$terms = preg_split('/[\s,]+/', $q);
-			common_element_start('ul', array('id' => 'profiles'));
-			for ($i = 0; $i < min($cnt, PROFILES_PER_PAGE); $i++) {
-				if ($profile->fetch()) {
-					$this->show_profile($profile, $terms);
-				} else {
-					// shouldn't happen!
-					break;
-				}
-			}
-			common_element_end('ul');
+			$results = new PeopleSearchResults($profile, $terms);
+			$results->show_list();
 		} else {
-			common_element('p', 'error', _t('No results'));
+			common_element('p', 'error', _('No results'));
 		}
+
+		$profile->free();
 		
 		common_pagination($page > 1, $cnt > PROFILES_PER_PAGE,
 						  $page, 'peoplesearch', array('q' => $q));
 	}
+}
+
+class PeopleSearchResults extends ProfileList {
+
+	var $terms = NULL;
+	var $pattern = NULL;
 	
-	function show_profile($profile, $terms) {
-		common_element_start('li', array('class' => 'profile_single',
-										 'id' => 'profile-' . $profile->id));
-		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-		common_element_start('a', array('href' => $profile->profileurl));
-		common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-									'class' => 'avatar stream',
-									'width' => AVATAR_STREAM_SIZE,
-									'height' => AVATAR_STREAM_SIZE,
-									'alt' =>
-									($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_text(' | ');
-			common_element_start('span', 'fullname');
-			common_raw($this->highlight($profile->fullname, $terms));
-			common_element_end('span');
-		}
-		if ($profile->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->bio) {
-			common_element_start('p', 'bio');
-			common_raw($this->highlight($profile->bio, $terms));
-			common_element_end('p');
-		}
-		common_element_end('li');
+	function __construct($profile, $terms) {
+		parent::__construct($profile);
+		$this->terms = array_map('preg_quote', 
+								 array_map('htmlspecialchars', $terms));
+		$this->pattern = '/('.implode('|',$terms).')/i';
 	}
-
-	function highlight($text, $terms) {
-		$pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
-		$result = preg_replace($pattern, '<strong>\\1</strong>', htmlspecialchars($text));
-		return $result;
+	
+	function highlight($text) {
+		return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
 	}
 }