Changeset 7910c0f in github

Timestamp:

Mar 3, 2010 7:11:04 AM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

aba0927

Parents:

d15d594

Message:

Remember search modifiers in user prefs (#1486146) + bring back the old defaults

Files:

• CHANGELOG (modified) (1 diff)
• program/js/app.js (modified) (1 diff)
• program/js/common.js (modified) (1 diff)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/search.inc (modified) (2 diffs)
• skins/default/functions.js (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Remember search modifiers in user prefs (#1486146)
 - Added force_7bit option to force MIME encoding of plain/text messages (#1486510)
 - Use case sensitive check when checking for default folders (#1486346)

program/js/app.js

@@ -2617 +2617 @@
         this.message_list.clear();
         if (this.env.search_mods) {
-          var head_arr = new Array();
-          for (var n in this.env.search_mods)
-            head_arr.push(n);
-          addurl += '&_headers='+head_arr.join(',');
+          var mods = this.env.search_mods[this.env.mailbox] ? this.env.search_mods[this.env.mailbox] : this.env.search_mods['*'];
+          if (mods) {
+            var head_arr = new Array();
+            for (var n in mods)
+              head_arr.push(n);
+            addurl += '&_headers='+head_arr.join(',');
+            }
           }
         } else if (this.contact_list) {

program/js/common.js

@@ -491 +491 @@
   }
 
+// recursively copy an object
+function rcube_clone_object(obj)
+{
+  var out = {};
+  
+  for (var key in obj) {
+    if (obj[key] && typeof obj[key] == 'object')
+      out[key] = clone_object(obj[key]);
+    else
+      out[key] = obj[key];
+  }
+  
+  return out;
+}
 
 // make a string URL safe

program/steps/mail/func.inc

@@ -20 +20 @@
 */
 
+// setup some global vars used by mail steps
+$SENT_MBOX = $RCMAIL->config->get('sent_mbox');
+$DRAFTS_MBOX = $RCMAIL->config->get('drafts_mbox');
+$SEARCH_MODS_DEFAULT = array('*' => array('subject'=>1, 'from'=>1), $SENT_MBOX => array('subject'=>1, 'to'=>1), $DRAFTS_MBOX => array('subject'=>1, 'to'=>1));
+
 $EMAIL_ADDRESS_PATTERN = '([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9][a-z0-9\-\.]*\\.[a-z]{2,5})';
 
@@ -80 +85 @@
       }
     
-      $OUTPUT->set_env('search_mods', $_SESSION['search_mods'] ? $_SESSION['search_mods'] : array('subject'=>'subject'));
+      $search_mods = $RCMAIL->config->get('search_mods', $SEARCH_MODS_DEFAULT);
+      $OUTPUT->set_env('search_mods', $search_mods);
+      
       // make sure the message count is refreshed (for default view)
       $IMAP->messagecount($mbox_name, 'ALL', true);

program/steps/mail/search.inc

@@ -73 +73 @@
 {
   if ($headers) {
-    $headers = explode(',', $headers);
-    foreach($headers as $header)
+    foreach(explode(',', $headers) as $header)
       switch ($header) {
         case 'text': $subject['text'] = 'TEXT'; break;
-        default: $subject[$header] = 'HEADER '.$header;
+        default:     $subject[$header] = 'HEADER '.strtoupper($header);
       }
+    
+    // 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));
+    console($search_mods);
   } else {
     // search in subject by default
@@ -91 +96 @@
   foreach ($subject as $sub)
     $search_str .= sprintf(" %s {%d}\r\n%s", $sub, strlen($search), $search);
-  $_SESSION['search_mods'] = $subject;
 }
 

skins/default/functions.js

@@ -162 +162 @@
     var pos = $(ref).offset();
     this.searchmenu.css({ left:pos.left, top:(pos.top + ref.offsetHeight + 2)});
+    this.searchmenu.find(":checked").attr('checked', false);
 
     if (rcmail.env.search_mods) {
-      for (var n in rcmail.env.search_mods) {
-        box = rcube_find_object('s_mod_' + n);
-        box.checked = 'checked';
-      }
+      var search_mods = rcmail.env.search_mods[rcmail.env.mailbox] ? rcmail.env.search_mods[rcmail.env.mailbox] : rcmail.env.search_mods['*'];
+      for (var n in search_mods)
+        $('#s_mod_' + n).attr('checked', true);
     }
   }
@@ -178 +178 @@
     rcmail.env.search_mods = new Object();
   
+  if (!rcmail.env.search_mods[rcmail.env.mailbox])
+    rcmail.env.search_mods[rcmail.env.mailbox] = rcube_clone_object(rcmail.env.search_mods['*']);
+  
   if (!elem.checked)
-    delete(rcmail.env.search_mods[elem.value]);
+    delete(rcmail.env.search_mods[rcmail.env.mailbox][elem.value]);
   else
-    rcmail.env.search_mods[elem.value] = elem.value;
+    rcmail.env.search_mods[rcmail.env.mailbox][elem.value] = elem.value;
 },