X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnoticesearch.php;h=4f4c7a05ba35fdd510cf4c9d69f465595b101926;hb=59a0b2a82da418f688faf182407146d9e7a7af7a;hp=79cf572ccaf59f2e4e2a5777966bd886c7625dc2;hpb=fc61b7162576deb11a7947a8a04293b744f9d5fc;p=quix0rs-gnu-social.git
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 79cf572cca..4f4c7a05ba 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -48,7 +48,6 @@ require_once INSTALLDIR.'/lib/searchaction.php';
*/
class NoticesearchAction extends SearchAction
{
-
function prepare($args)
{
parent::prepare($args);
@@ -65,6 +64,8 @@ class NoticesearchAction extends SearchAction
*/
function getInstructions()
{
+ // TRANS: Instructions for Notice search page.
+ // TRANS: %%site.name%% is the name of the StatusNet site.
return _('Search for notices on %%site.name%% by their contents. Separate search terms by spaces; they must be 3 characters or more.');
}
@@ -75,6 +76,7 @@ class NoticesearchAction extends SearchAction
*/
function title()
{
+ // TRANS: Title of the page where users can search for notices.
return _('Text search');
}
@@ -88,7 +90,9 @@ class NoticesearchAction extends SearchAction
return array(new Feed(Feed::RSS1, common_local_url('noticesearchrss',
array('q' => $q)),
- sprintf(_('Search results for "%s" on %s'),
+ // TRANS: Test in RSS notice search.
+ // TRANS: %1$s is the query, %2$s is the StatusNet site name.
+ sprintf(_('Search results for "%1$s" on %2$s'),
$q, common_config('site', 'name'))));
}
@@ -104,7 +108,7 @@ class NoticesearchAction extends SearchAction
{
$notice = new Notice();
- $search_engine = $notice->getSearchEngine('identica_notices');
+ $search_engine = $notice->getSearchEngine('notice');
$search_engine->set_sort_mode('chron');
// Ask for an extra to see if there's more.
$search_engine->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
@@ -114,14 +118,19 @@ class NoticesearchAction extends SearchAction
$cnt = $notice->find();
}
if ($cnt === 0) {
+ // TRANS: Text for notice search results is the query had no results.
$this->element('p', 'error', _('No results.'));
$this->searchSuggestions($q);
if (common_logged_in()) {
+ // TRANS: Text for logged in users making a query for notices without results.
+ // TRANS: This message contains a Markdown link.
$message = sprintf(_('Be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
}
else {
- $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
+ // TRANS: Text for not logged in users making a query for notices without results.
+ // TRANS: This message contains Markdown links.
+ $message = sprintf(_('Why not [register an account](%%%%action.register%%%%) and be the first to [post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!'), urlencode($q));
}
$this->elementStart('div', 'guide');
@@ -193,14 +202,20 @@ class SearchNoticeListItem extends NoticeListItem {
$options = implode('|', array_map('preg_quote', array_map('htmlspecialchars', $terms),
array_fill(0, sizeof($terms), '/')));
$pattern = "/($options)/i";
- $result = preg_replace($pattern, '\\1', $text);
+ $result = '';
+
+ /* Divide up into text (highlight me) and tags (don't touch) */
+ $chunks = preg_split('/(<[^>]+>)/', $text, 0, PREG_SPLIT_DELIM_CAPTURE);
+ foreach ($chunks as $i => $chunk) {
+ if ($i % 2 == 1) {
+ // odd: delimiter (tag)
+ $result .= $chunk;
+ } else {
+ // even: freetext between tags
+ $result .= preg_replace($pattern, '\\1', $chunk);
+ }
+ }
- /* Remove highlighting from inside links, loop incase multiple highlights in links */
- $pattern = '/(\w+="[^"]*)('.$options.')<\/strong>([^"]*")/iU';
- do {
- $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
- } while ($count);
return $result;
}
}
-