Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 75 insertions, 46 deletions

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 2e54233ec..3c672c940 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -1,5 +1,16 @@
 <?php
-/*
+/**
+ * People search action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,68 +28,86 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/searchaction.php');
-require_once(INSTALLDIR.'/lib/profilelist.php');
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-class PeoplesearchAction extends SearchAction {
+require_once INSTALLDIR.'/lib/searchaction.php';
+require_once INSTALLDIR.'/lib/profilelist.php';
 
-	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.');
-	}
+/**
+ * People search action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
+class PeoplesearchAction extends SearchAction
+{
+    function getInstructions()
+    {
+        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 _('People search');
-	}
+    function title()
+    {
+        return _('People search');
+    }
 
-	function show_results($q, $page) {
+    function showResults($q, $page)
+    {
 
-		$profile = new Profile();
+        $profile = new Profile();
 
-		# lcase it for comparison
-		$q = strtolower($q);
+        # lcase it for comparison
+        $q = strtolower($q);
 
         $search_engine = $profile->getSearchEngine('identica_people');
 
         $search_engine->set_sort_mode('chron');
-		# Ask for an extra to see if there's more.
+        # 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();
+            $cnt = $profile->find();
+        }
+        if ($cnt > 0) {
+            $terms = preg_split('/[\s,]+/', $q);
+            $results = new PeopleSearchResults($profile, $terms, $this);
+            $results->show();
+        } else {
+            $this->element('p', 'error', _('No results'));
         }
-		if ($cnt > 0) {
-			$terms = preg_split('/[\s,]+/', $q);
-			$results = new PeopleSearchResults($profile, $terms);
-			$results->show_list();
-		} else {
-			common_element('p', 'error', _('No results'));
-		}
 
-		$profile->free();
-		
-		common_pagination($page > 1, $cnt > PROFILES_PER_PAGE,
-						  $page, 'peoplesearch', array('q' => $q));
-	}
+        $profile->free();
+        
+        $this->pagination($page > 1, $cnt > PROFILES_PER_PAGE,
+                          $page, 'peoplesearch', array('q' => $q));
+    }
 }
 
-class PeopleSearchResults extends ProfileList {
-
-	var $terms = NULL;
-	var $pattern = NULL;
-	
-	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) {
-		return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
-	}
+class PeopleSearchResults extends ProfileList
+{
+    var $terms = null;
+    var $pattern = null;
+    
+    function __construct($profile, $terms, $action)
+    {
+        parent::__construct($profile, $terms, $action);
+        $this->terms = array_map('preg_quote', 
+                                 array_map('htmlspecialchars', $terms));
+        $this->pattern = '/('.implode('|',$terms).')/i';
+    }
+    
+    function highlight($text)
+    {
+        return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
+    }
 }
+