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

release-0.6
thomascube 17 years ago
parent cf1f0f97b2
commit a02d486cc8

@ -6,7 +6,9 @@ CHANGELOG RoundCube Webmail
- Fix regular expression for checking e-mail address (#1484710) - Fix regular expression for checking e-mail address (#1484710)
- Make sending of read receipts configurable - Make sending of read receipts configurable
- Respect config when localize folder names (#1484707) - 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) 2008/02/02 (thomasb)
---------- ----------

@ -3495,10 +3495,7 @@ function rcube_webmail()
this.check_for_recent = function() this.check_for_recent = function()
{ {
if (this.busy) if (this.busy)
{
this.send_keep_alive();
return; return;
}
this.set_busy(true, 'checkingmail'); this.set_busy(true, 'checkingmail');
this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true); this.http_request('check-recent', (this.env.search_request ? '_search='+this.env.search_request+'&' : '') + '_t='+(new Date().getTime()), true);

@ -39,18 +39,22 @@ if ($_action=='expunge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
// clear mailbox // clear mailbox
else if ($_action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) else if ($_action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST)))
{ {
$success = $IMAP->clear_mailbox($mbox); // we should only be purging trash and junk
if($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox'])
if ($success && !empty($_REQUEST['_reload']))
{ {
$OUTPUT->set_env('messagecount', 0); $success = $IMAP->clear_mailbox($mbox);
$OUTPUT->set_env('pagecount', 0);
$OUTPUT->command('message_list.clear'); if ($success && !empty($_REQUEST['_reload']))
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); {
$OUTPUT->command('set_unread_count', $mbox_name, 0); $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); $OUTPUT->send($commands);

@ -10,6 +10,7 @@ body
body.iframe body.iframe
{ {
margin: 0px; margin: 0px;
background-color: #FFF;
} }
body.extwin body.extwin

@ -331,6 +331,10 @@ body.messagelist
width: expression(parseInt(document.getElementById('mailcontframe').clientWidth)+'px'); 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 #messagelist thead tr td
{ {
height: 20px; height: 20px;

Loading…
Cancel
Save