Changeset a02d486 in github


Ignore:
Timestamp:
Feb 5, 2008 5:56:29 PM (5 years ago)
Author:
thomascube <thomas@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
b155682
Parents:
cf1f0f9
Message:

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

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • CHANGELOG

    rcf1f0f9 ra02d486  
    77- Make sending of read receipts configurable 
    88- Respect config when localize folder names (#1484707) 
    9 - Aplied patch for updating page title (#1484727, #1484650) 
     9- Applied patch for updating page title (#1484727, #1484650) 
     10- Applied patch to prevent from purging inbox by uberlinuxguy (#1484449) 
     11- Add CSS hack for Safari 
    1012 
    11132008/02/02 (thomasb) 

  • program/js/app.js

    r1f020b5 ra02d486  
    34963496    { 
    34973497    if (this.busy) 
    3498       { 
    3499       this.send_keep_alive(); 
    35003498      return; 
    3501       } 
    35023499 
    35033500    this.set_busy(true, 'checkingmail'); 

  • program/steps/mail/folders.inc

    r5349b78 ra02d486  
    4040else if ($_action=='purge' && ($mbox = get_input_value('_mbox', RCUBE_INPUT_POST))) 
    4141{ 
    42   $success = $IMAP->clear_mailbox($mbox); 
     42  // we should only be purging trash and junk 
     43  if($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox'])  
     44  { 
     45    $success = $IMAP->clear_mailbox($mbox); 
    4346   
    44   if ($success && !empty($_REQUEST['_reload'])) 
    45   { 
    46     $OUTPUT->set_env('messagecount', 0); 
    47     $OUTPUT->set_env('pagecount', 0); 
    48     $OUTPUT->command('message_list.clear'); 
    49     $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); 
    50     $OUTPUT->command('set_unread_count', $mbox_name, 0); 
     47    if ($success && !empty($_REQUEST['_reload'])) 
     48    { 
     49      $OUTPUT->set_env('messagecount', 0); 
     50      $OUTPUT->set_env('pagecount', 0); 
     51      $OUTPUT->command('message_list.clear'); 
     52      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); 
     53      $OUTPUT->command('set_unread_count', $mbox_name, 0); 
     54    } 
     55    else 
     56      $commands = "// purged: $success"; 
    5157  } 
    52   else 
    53     $commands = "// purged: $success"; 
    5458} 
    5559 

  • skins/default/common.css

    r5a6efff ra02d486  
    1111{ 
    1212  margin: 0px; 
     13  background-color: #FFF; 
    1314} 
    1415 

  • skins/default/mail.css

    rc708c9a ra02d486  
    332332} 
    333333 
     334/* safari hack \*/ 
     335html>body*#messagelist[id$="messagelist"]:not([class="none"]) { table-layout: auto; } 
     336/**/ 
     337 
    334338#messagelist thead tr td 
    335339{ 
Note: See TracChangeset for help on using the changeset viewer.