From 041c93ce0bc00cb6417ce2e4bdce2ed84d37f50a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 22 May 2012 06:31:37 -0400
Subject: [PATCH] Removed $Id$
---
program/steps/mail/folders.inc | 94 ++++++++++++++++++++++++++++------------------
1 files changed, 57 insertions(+), 37 deletions(-)
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index 5a22b7e..c56c914 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -4,9 +4,12 @@
+-----------------------------------------------------------------------+
| program/steps/mail/folders.inc |
| |
- | This file is part of the RoundCube Webmail client |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | Licensed under the GNU GPL |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
+ | |
+ | Licensed under the GNU General Public License version 3 or |
+ | any later version with exceptions for skins & plugins. |
+ | See the README file for a full license statement. |
| |
| PURPOSE: |
| Implement folder operations line EXPUNGE and Clear |
@@ -14,48 +17,65 @@
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
-
- $Id$
*/
-$REMOTE_REQUEST = TRUE;
-$mbox = $IMAP->get_mailbox_name();
+// only process ajax requests
+if (!$OUTPUT->ajax_call)
+ return;
+$mbox = get_input_value('_mbox', RCUBE_INPUT_POST, true);
// send EXPUNGE command
-if ($_action=='expunge')
- {
- $success = $IMAP->expunge($_GET['_mbox']);
+if ($RCMAIL->action == 'expunge') {
- // reload message list if current mailbox
- if ($success && $_GET['_reload'])
- {
- rcube_remote_response('this.clear_message_list();', TRUE);
- $_action = 'list';
- return;
+ $success = $RCMAIL->storage->expunge_folder($mbox);
+
+ // reload message list if current mailbox
+ if ($success) {
+ $OUTPUT->show_message('folderexpunged', 'confirmation');
+
+ if (!empty($_REQUEST['_reload'])) {
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+ $OUTPUT->command('message_list.clear');
+ $RCMAIL->action = 'list';
+ return;
+ }
}
- else
- $commands = "// expunged: $success\n";
- }
+ else {
+ rcmail_display_server_error();
+ }
+}
// clear mailbox
-else if ($_action=='purge')
- {
- $success = $IMAP->clear_mailbox($_GET['_mbox']);
-
- if ($success && $_GET['_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));
+else if ($RCMAIL->action == 'purge')
+{
+ $delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
+ $trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/';
+ $junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/';
+
+ // we should only be purging trash and junk (or their subfolders)
+ if ($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']
+ || preg_match($trash_regexp, $mbox) || preg_match($junk_regexp, $mbox)
+ ) {
+ $success = $RCMAIL->storage->clear_folder($mbox);
+
+ if ($success) {
+ $OUTPUT->show_message('folderpurged', 'confirmation');
+
+ if (!empty($_REQUEST['_reload'])) {
+ $OUTPUT->set_env('messagecount', 0);
+ $OUTPUT->set_env('pagecount', 0);
+ $OUTPUT->command('message_list.clear');
+ $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox);
+ $OUTPUT->command('set_unread_count', $mbox, 0);
+ $OUTPUT->command('set_quota', rcmail_quota_content());
+ rcmail_set_unseen_count($mbox, 0);
+ }
+ }
+ else {
+ rcmail_display_server_error();
+ }
}
- else
- $commands = "// purged: $success";
- }
+}
-
-
-rcube_remote_response($commands);
-?>
\ No newline at end of file
+$OUTPUT->send();
--
Gitblit v1.9.1