Imported Upstream version 0.2~alpha

[roundcube.git] / program / steps / mail / folders.inc

diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index 3faf0f8ee92e6e56dff6ecfdeea95a931f86cab1..d0825ffac891fb2e8539a217507ec919661c93b4 100644 (file)
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -5,7 +5,7 @@
  | program/steps/mail/folders.inc                                        |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  | PURPOSE:                                                              |
@@ -15,47 +15,47 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
 
- $Id: folders.inc 232 2006-05-18 15:46:50Z cmcnulty $
+ $Id: folders.inc 1344 2008-04-30 08:21:42Z thomasb $
 */
 
-$REMOTE_REQUEST = TRUE;
 $mbox_name = $IMAP->get_mailbox_name();
 
-
 // send EXPUNGE command
-if ($_action=='expunge')
-  {
-  $success = $IMAP->expunge($_GET['_mbox']);
+if ($RCMAIL->action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
+{
+  $success = $IMAP->expunge($mbox);
 
   // reload message list if current mailbox  
-  if ($success && $_GET['_reload'])
-    {
-    rcube_remote_response('this.clear_message_list();', TRUE);
-    $_action = 'list';
+  if ($success && !empty($_REQUEST['_reload']))
+  {
+    $OUTPUT->command('message_list.clear');
+    $RCMAIL->action = 'list';
     return;
-    }
+  }
   else
     $commands = "// expunged: $success\n";
-  }
+}
 
 // clear mailbox
-else if ($_action=='purge')
+else if ($RCMAIL->action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
+{
+  // we should only be purging trash and junk
+  if($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']) 
   {
-  $success = $IMAP->clear_mailbox($_GET['_mbox']);
+    $success = $IMAP->clear_mailbox($mbox);
   
-  if ($success && $_GET['_reload'])
+    if ($success && !empty($_REQUEST['_reload']))
     {
-    $commands = "this.clear_message_list();\n";
-    $commands .= "this.set_env('messagecount', 0);\n";
-    $commands .= "this.set_env('pagecount', 0);\n";
-    $commands .= sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text());
-    $commands .= sprintf("this.set_unread_count('%s', 0);\n", addslashes($mbox_name));
+      $OUTPUT->set_env('messagecount', 0);
+      $OUTPUT->set_env('pagecount', 0);
+      $OUTPUT->command('message_list.clear');
+      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text());
+      $OUTPUT->command('set_unread_count', $mbox_name, 0);
     }
-  else
-    $commands = "// purged: $success";
+    else
+      $commands = "// purged: $success";
   }
+}
 
-
-
-rcube_remote_response($commands);
-?>
\ No newline at end of file
+$OUTPUT->send($commands);
+?>