trac685 Twitter bridge - Shell script to sync all users' Twitter friends

[quix0rs-gnu-social.git] / actions / peoplesearch.php

diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 86c64983c572c75a4362e096fd6b8d42cffc2ea7..4e0ec3f0c41d3db8baf61156908096e600222a4e 100644 (file)
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -20,30 +20,35 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/searchaction.php');
-define(PROFILES_PER_PAGE, 10);
+define('PROFILES_PER_PAGE', 10);
 
 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) ' . 
+
+               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();
@@ -61,13 +66,13 @@ class PeoplesearchAction extends SearchAction {
                        }
                        common_element_end('ul');
                } else {
-                       common_element('p', 'error', _t('No results'));
+                       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));
@@ -101,8 +106,9 @@ class PeoplesearchAction extends SearchAction {
                common_element_end('p');
                if ($profile->homepage) {
                        common_element_start('p', 'website');
-                       common_element('a', array('href' => $profile->homepage),
-                                                  $this->highlight($profile->homepage, $terms));
+                       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) {
@@ -114,7 +120,8 @@ class PeoplesearchAction extends SearchAction {
        }
 
        function highlight($text, $terms) {
-               $pattern = '/('.implode('|',array_map('htmlspecialchars', $terms)).')/i';
+               $terms = array_map('preg_quote', array_map('htmlspecialchars', $terms));
+               $pattern = '/('.implode('|',$terms).')/i';
                $result = preg_replace($pattern, '<strong>\\1</strong>', htmlspecialchars($text));
                return $result;
        }