gui refactoring to enable more complex search queries

This commit is contained in:
SJ
2013-10-05 11:34:06 +02:00
parent 29f4b60a9c
commit f08269603f
4 changed files with 121 additions and 214 deletions

View File

@ -428,6 +428,8 @@ class ModelSearchMessage extends Model {
private function highlight_search_terms($s = '', $terms = '') {
$fields = array("from:", "to:", "subject:", "body:");
$terms = preg_replace("/(\'|\")/", "", $terms);
$terms = explode(" ", $terms);
@ -435,6 +437,10 @@ class ModelSearchMessage extends Model {
if(count($terms) <= 0) { return $s; }
while(list($k, $v) = each($terms)) {
if(in_array($v, $fields)) { continue; }
$v = preg_replace("/\W/", "", $v);
if(strlen($v) < 3) { continue; }
$s = preg_replace("/$v/i", "<span class=\"message_highlight\">$v</span>", $s);