Changeset 4fb6a28 in github

Timestamp:

Jun 1, 2011 3:31:53 PM (2 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

fde361e

Parents:

4dcd437

Message:

• Fix doubled encoding in save-pref request (#1487941), small code improvements

Location:

program

Files:

• include/main.inc (modified) (1 diff)
• js/app.js (modified) (9 diffs)

program/include/main.inc

@@ -1206 +1206 @@
     $RCMAIL->output->add_gui_object('mailboxlist', $attrib['id']);
     $RCMAIL->output->set_env('mailboxes', $js_mailboxlist);
-    $RCMAIL->output->set_env('collapsed_folders', $RCMAIL->config->get('collapsed_folders'));
+    $RCMAIL->output->set_env('collapsed_folders', (string)$RCMAIL->config->get('collapsed_folders'));
   }
 

program/js/app.js

@@ -280 +280 @@
 
         break;
-
 
       case 'addressbook':
@@ -1179 +1178 @@
   this.save_pref = function(prop)
   {
-    var request = {'_name': prop.name, '_value': urlencode(prop.value)};
+    var request = {'_name': prop.name, '_value': prop.value};
 
     if (prop.session)
-      request['_session'] = urlencode(prop.session);
+      request['_session'] = prop.session;
     if (prop.env)
       this.env[prop.env] = prop.value;
@@ -2607 +2606 @@
   this.toggle_read_status = function(flag, a_uids)
   {
+    var i, len = a_uids.length,
+      url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+      lock = this.display_message(this.get_label('markingmessage'), 'loading');
+
     // mark all message rows as read/unread
-    for (var i=0; i<a_uids.length; i++)
+    for (i=0; i<len; i++)
       this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
-
-    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
-      lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     // also send search request to get the right messages
@@ -2620 +2620 @@
     this.http_post('mark', url, lock);
 
-    for (var i=0; i<a_uids.length; i++)
+    for (i=0; i<len; i++)
       this.update_thread_root(a_uids[i], flag);
   };
@@ -2627 +2627 @@
   this.toggle_flagged_status = function(flag, a_uids)
   {
+    var i, len = a_uids.length,
+      url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
+      lock = this.display_message(this.get_label('markingmessage'), 'loading');
+
     // mark all message rows as flagged/unflagged
-    for (var i=0; i<a_uids.length; i++)
+    for (i=0; i<len; i++)
       this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
-
-    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag,
-      lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     // also send search request to get the right messages
@@ -2644 +2645 @@
   this.toggle_delete_status = function(a_uids)
   {
-    var rows = this.message_list ? this.message_list.rows : [];
-
-    if (a_uids.length==1) {
+    var len = a_uids.length,
+      i, uid, all_deleted = true,
+      rows = this.message_list ? this.message_list.rows : [];
+
+    if (len == 1) {
       if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
         this.flag_as_deleted(a_uids);
@@ -2655 +2658 @@
     }
 
-    var uid, all_deleted = true;
-    for (var i=0, len=a_uids.length; i<len; i++) {
+    for (i=0; i<len; i++) {
       uid = a_uids[i];
       if (rows[uid] && !rows[uid].deleted) {
@@ -2674 +2676 @@
   this.flag_as_undeleted = function(a_uids)
   {
-    for (var i=0, len=a_uids.length; i<len; i++)
+    var i, len=a_uids.length,
+      url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete',
+      lock = this.display_message(this.get_label('markingmessage'), 'loading');
+
+    for (i=0; i<len; i++)
       this.set_message(a_uids[i], 'deleted', false);
-
-    var url = '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete',
-      lock = this.display_message(this.get_label('markingmessage'), 'loading');
 
     // also send search request to get the right messages
@@ -2745 +2748 @@
   this.flag_deleted_as_read = function(uids)
   {
-    var icn_src, uid,
-      rows = this.message_list ? this.message_list.rows : [],
-      str = String(uids),
-      a_uids = str.split(',');
-
-    for (var i=0; i<a_uids.length; i++) {
-      uid = a_uids[i];
+    var icn_src, uid, i, len,
+      rows = this.message_list ? this.message_list.rows : [];
+
+    uids = String(uids).split(',');
+
+    for (i=0, len=uids.length; i<len; i++) {
+      uid = uids[i];
       if (rows[uid])
         this.set_message(uid, 'unread', false);