More CS fixes, replace global $CONFIG usage with $RCMAIL->config->get()

1 files changed, 71 insertions, 69 deletions

diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index 210bedbb8..a80887254 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -1,14 +1,18 @@
 <?php
+
 /*
  +-----------------------------------------------------------------------+
  | steps/mail/search.inc                                                 |
  |                                                                       |
- | Search functions for rc webmail                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
  |                                                                       |
+ | PURPOSE:                                                              |
+ |   Mail messages search action                                         |
  +-----------------------------------------------------------------------+
  | Author: Benjamin Smith <defitro@gmail.com>                            |
  |         Thomas Bruederli <roundcube@gmail.com>                        |
@@ -41,110 +45,108 @@ $search_str = $filter && $filter != 'ALL' ? $filter : '';
 $_SESSION['search_filter'] = $filter;
 
 // Check the search string for type of search
-if (preg_match("/^from:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['from'] = "HEADER FROM";
+if (preg_match("/^from:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['from'] = "HEADER FROM";
 }
-else if (preg_match("/^to:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['to'] = "HEADER TO";
+else if (preg_match("/^to:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['to'] = "HEADER TO";
 }
-else if (preg_match("/^cc:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['cc'] = "HEADER CC";
+else if (preg_match("/^cc:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['cc'] = "HEADER CC";
 }
-else if (preg_match("/^bcc:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['bcc'] = "HEADER BCC";
+else if (preg_match("/^bcc:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['bcc'] = "HEADER BCC";
 }
-else if (preg_match("/^subject:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['subject'] = "HEADER SUBJECT";
+else if (preg_match("/^subject:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['subject'] = "HEADER SUBJECT";
 }
-else if (preg_match("/^body:.*/i", $str))
-{
-  list(,$srch) = explode(":", $str);
-  $subject['body'] = "BODY";
+else if (preg_match("/^body:.*/i", $str)) {
+    list(,$srch) = explode(":", $str);
+    $subject['body'] = "BODY";
 }
-else if (strlen(trim($str)))
-{
-  if ($headers) {
-    foreach (explode(',', $headers) as $header) {
-      if ($header == 'text') {
-        // #1488208: get rid of other headers when searching by "TEXT"
-        $subject = array('text' => 'TEXT');
-        break;
-      }
-      else {
-        $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
-      }
+else if (strlen(trim($str))) {
+    if ($headers) {
+        foreach (explode(',', $headers) as $header) {
+            if ($header == 'text') {
+                // #1488208: get rid of other headers when searching by "TEXT"
+                $subject = array('text' => 'TEXT');
+                break;
+            }
+            else {
+                $subject[$header] = ($header != 'body' ? 'HEADER ' : '') . strtoupper($header);
+            }
+        }
+
+        // save search modifiers for the current folder to user prefs
+        $search_mods        = rcmail_search_mods();
+        $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
+
+        $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
+    }
+    else {
+        // search in subject by default
+        $subject['subject'] = 'HEADER SUBJECT';
     }
-
-    // save search modifiers for the current folder to user prefs
-    $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
-    $search_mods[$mbox] = array_fill_keys(array_keys($subject), 1);
-    $RCMAIL->user->save_prefs(array('search_mods' => $search_mods));
-  }
-  else {
-    // search in subject by default
-    $subject['subject'] = 'HEADER SUBJECT';
-  }
 }
 
 $search = isset($srch) ? trim($srch) : trim($str);
 
 if (!empty($subject)) {
-  $search_str .= str_repeat(' OR', count($subject)-1);
-  foreach ($subject as $sub)
-    $search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
+    $search_str .= str_repeat(' OR', count($subject)-1);
+    foreach ($subject as $sub) {
+        $search_str .= ' ' . $sub . ' ' . rcube_imap_generic::escape($search);
+    }
 }
 
 $search_str  = trim($search_str);
 $sort_column = rcmail_sort_column();
 
 // execute IMAP search
-if ($search_str)
-  $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);
+if ($search_str) {
+    $RCMAIL->storage->search($mbox, $search_str, $imap_charset, $sort_column);
+}
 
 // save search results in session
-if (!is_array($_SESSION['search']))
-  $_SESSION['search'] = array();
+if (!is_array($_SESSION['search'])) {
+    $_SESSION['search'] = array();
+}
 
 if ($search_str) {
-  $_SESSION['search'] = $RCMAIL->storage->get_search_set();
-  $_SESSION['last_text_search'] = $str;
+    $_SESSION['search'] = $RCMAIL->storage->get_search_set();
+    $_SESSION['last_text_search'] = $str;
 }
 $_SESSION['search_request'] = $search_request;
 
 
 // Get the headers
 $result_h = $RCMAIL->storage->list_messages($mbox, 1, $sort_column, rcmail_sort_order());
-$count = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
+$count    = $RCMAIL->storage->count($mbox, $RCMAIL->storage->get_threading() ? 'THREADS' : 'ALL');
 
 // Make sure we got the headers
 if (!empty($result_h)) {
-  rcmail_js_message_list($result_h);
-  if ($search_str)
-    $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
-
-  // remember last HIGHESTMODSEQ value (if supported)
-  // we need it for flag updates in check-recent
-  $data = $RCMAIL->storage->folder_data($mbox_name);
-  if (!empty($data['HIGHESTMODSEQ'])) {
-    $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
-  }
+    rcmail_js_message_list($result_h);
+    if ($search_str) {
+        $OUTPUT->show_message('searchsuccessful', 'confirmation', array('nr' => $RCMAIL->storage->count(NULL, 'ALL')));
+    }
+
+    // remember last HIGHESTMODSEQ value (if supported)
+    // we need it for flag updates in check-recent
+    $data = $RCMAIL->storage->folder_data($mbox_name);
+    if (!empty($data['HIGHESTMODSEQ'])) {
+        $_SESSION['list_mod_seq'] = $data['HIGHESTMODSEQ'];
+    }
 }
 // handle IMAP errors (e.g. #1486905)
 else  if ($err_code = $RCMAIL->storage->get_error_code()) {
-  $RCMAIL->display_server_error();
+    $RCMAIL->display_server_error();
 }
 else {
-  $OUTPUT->show_message('searchnomatch', 'notice');
+    $OUTPUT->show_message('searchnomatch', 'notice');
 }
 
 // update message count display