Applied patch to prevent from purging inbox (#1484449) + CSS hack for Safari

5 files changed, 22 insertions, 14 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 03abaea20..783d25481 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,9 @@ CHANGELOG RoundCube Webmail
 - Fix regular expression for checking e-mail address (#1484710)
 - Make sending of read receipts configurable
 - Respect config when localize folder names (#1484707)
-- Aplied patch for updating page title (#1484727, #1484650)
+- Applied patch for updating page title (#1484727, #1484650)
+- Applied patch to prevent from purging inbox by uberlinuxguy (#1484449)
+- Add CSS hack for Safari
 
 2008/02/02 (thomasb)
 ----------
diff --git a/program/js/app.js b/program/js/app.js
index 0288fad79..66b7de05b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3495,10 +3495,7 @@ function rcube_webmail()
   this.check_for_recent = function()
     {
     if (this.busy)
-      {
-      this.send_keep_alive();
       return;
-      }
 
     this.set_busy(true, 'checkingmail');
     this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index c7c39fbea..b84398f26 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -39,18 +39,22 @@ if ($_action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
 // clear mailbox
 else if ($_action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
 {
-  $success = $IMAP->clear_mailbox($mbox);
-  
-  if ($success && !empty($_REQUEST['_reload']))
+  // we should only be purging trash and junk
+  if($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']) 
   {
-    $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);
+    $success = $IMAP->clear_mailbox($mbox);
+  
+    if ($success && !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());
+      $OUTPUT->command('set_unread_count', $mbox_name, 0);
+    }
+    else
+      $commands = "// purged: $success";
   }
-  else
-    $commands = "// purged: $success";
 }
 
 $OUTPUT->send($commands);
diff --git a/skins/default/common.css b/skins/default/common.css
index c7743e84a..308953bf5 100644
--- a/skins/default/common.css
+++ b/skins/default/common.css
@@ -10,6 +10,7 @@ body
 body.iframe
 {
   margin: 0px;
+  background-color: #FFF;
 }
 
 body.extwin
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 3ea7246a1..4e2fd59d5 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -331,6 +331,10 @@ body.messagelist
   width: expression(parseInt(document.getElementById('mailcontframe').clientWidth)+'px');
 }
 
+/* safari hack \*/
+html>body*#messagelist[id$="messagelist"]:not([class="none"]) { table-layout: auto; }
+/**/
+
 #messagelist thead tr td
 {
   height: 20px;