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

git-svn-id: https://svn.roundcube.net/trunk@4390 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 24 deletions

diff --git a/plugins/archive/archive.php b/plugins/archive/archive.php
index bd18aa4ed..fbb01296d 100644
--- a/plugins/archive/archive.php
+++ b/plugins/archive/archive.php
@@ -17,8 +17,6 @@ class archive extends rcube_plugin
   {
     $rcmail = rcmail::get_instance();
 
-    $this->register_action('plugin.archive', array($this, 'request_action'));
-
     // There is no "Archived flags"
     // $GLOBALS['IMAP_FLAGS']['ARCHIVED'] = 'Archive';
     if ($rcmail->task == 'mail' && ($rcmail->action == '' || $rcmail->action == 'show')
@@ -80,34 +78,14 @@ class archive extends rcube_plugin
     foreach ($list as $idx => $item) {
       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();
-  }
-
   function prefs_table($args)
   {
     global $CURR_SECTION;