From ddd776b2a3a264777233410e4bb311233fd24d3c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 24 Jun 2008 13:04:57 +0000
Subject: - Allow trash/junk subfolders to be purged (#1485085)

---
 program/steps/mail/folders.inc | 9 +++++++--
 program/steps/mail/func.inc    | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index 69f3c0e4c..7fd1f62cc 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -39,8 +39,13 @@ if ($RCMAIL->action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_
 // clear mailbox
 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']) 
+  $delimiter = $IMAP->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 = $IMAP->clear_mailbox($mbox);
   
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index bb5ece5c1..7fbda27b4 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -57,6 +57,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
 // set current mailbox in client environment
 $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
 $OUTPUT->set_env('quota', $IMAP->get_capability('quota'));
+$OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter());
 
 if ($CONFIG['trash_mbox'])
   $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
-- 
cgit v1.2.3