Changeset 4390 in subversion

Timestamp:

Jan 4, 2011 12:21:34 PM (2 years ago)

Author:

thomasb

Message:

Simplify archive plugin: trigger move-to-folder client side, only showing one confirmation message

Location:

trunk/plugins/archive

Files:

• archive.js (modified) (1 diff)
• archive.php (modified) (2 diffs)

trunk/plugins/archive/archive.js

@@ -9 +9 @@
     return;
   
-  var uids = rcmail.env.uid ? rcmail.env.uid : rcmail.message_list.get_selection().join(','),
-    lock = rcmail.set_busy(true, 'loading');
-
-  rcmail.http_post('plugin.archive', '_uid='+uids+'&_mbox='+urlencode(rcmail.env.mailbox), lock);
+  if (rcmail.env.mailbox != rcmail.env.archive_folder)
+    rcmail.command('moveto', rcmail.env.archive_folder);
 }
 

trunk/plugins/archive/archive.php

@@ -17 +17 @@
   {
     $rcmail = rcmail::get_instance();
-
-    $this->register_action('plugin.archive', array($this, 'request_action'));
 
     // There is no "Archived flags"
@@ -81 +79 @@
       if ($item['id'] == $folder) {
         $list[$idx]['name'] = $new_name;
-        return true;
+        return true;
       } else if (!empty($item['folders']))
         if ($this->_mod_folder_name($list[$idx]['folders'], $folder, $new_name))
-          return true;
+        return true;
     }
     return false;
-  }
-
-  function request_action()
-  {
-    $this->add_texts('localization');
-    
-    $uids = get_input_value('_uid', RCUBE_INPUT_POST);
-    $mbox = get_input_value('_mbox', RCUBE_INPUT_POST);
-    
-    $rcmail = rcmail::get_instance();
-    
-    // There is no "Archive flags", but I left this line in case it may be useful
-    // $rcmail->imap->set_flag($uids, 'ARCHIVE');
-    
-    if (($archive_mbox = $rcmail->config->get('archive_mbox')) && $mbox != $archive_mbox) {
-      $rcmail->output->command('move_messages', $archive_mbox);
-      $rcmail->output->command('display_message', $this->gettext('archived'), 'confirmation');
-    }
-    
-    $rcmail->output->send();
   }