Changeset 5266 in subversion


Ignore:
Timestamp:
Sep 22, 2011 3:49:33 AM (20 months ago)
Author:
alec
Message:
  • Fix bug where after delete message rows can be added to the list of another folder (#1487752)
Location:
trunk/roundcubemail
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r5262 r5266  
    22=========================== 
    33 
     4- Fix bug where after delete message rows can be added to the list of another folder (#1487752) 
    45- Add notice on autocompletion that not all records were displayed 
    56- Add option 'searchonly' for LDAP address books 

  • trunk/roundcubemail/program/js/app.js

    r5265 r5266  
    16421642      return false; 
    16431643 
     1644    // Prevent from adding messages from different folder (#1487752) 
     1645    if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check) 
     1646      return false; 
     1647 
    16441648    if (!this.env.messages[uid]) 
    16451649      this.env.messages[uid] = {}; 
    … …  
    20922096 
    20932097  // Initializes threads indicators/expanders after list update 
    2094   this.init_threads = function(roots) 
    2095   { 
     2098  this.init_threads = function(roots, mbox) 
     2099  { 
     2100    // #1487752 
     2101    if (mbox && mbox != this.env.mailbox) 
     2102      return false; 
     2103 
    20962104    for (var n=0, len=roots.length; n<len; n++) 
    20972105      this.add_tree_icons(roots[n]); 
    … …  
    54645472 
    54655473  // replace content of row count display 
    5466   this.set_rowcount = function(text) 
    5467   { 
     5474  this.set_rowcount = function(text, mbox) 
     5475  { 
     5476    // #1487752 
     5477    if (mbox && mbox != this.env.mailbox) 
     5478      return false; 
     5479 
    54685480    $(this.gui_objects.countdisplay).html(text); 
    54695481 

  • trunk/roundcubemail/program/steps/mail/check_recent.inc

    r5233 r5266  
    8282        $OUTPUT->set_env('messagecount', $all_count); 
    8383        $OUTPUT->set_env('pagecount', ceil($all_count/$IMAP->page_size)); 
    84         $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count)); 
     84        $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($all_count), $mbox_name); 
    8585        $OUTPUT->set_env('current_page', $all_count ? $IMAP->list_page : 1); 
    8686 

  • trunk/roundcubemail/program/steps/mail/folders.inc

    r4410 r5266  
    6666                $OUTPUT->set_env('pagecount', 0); 
    6767                $OUTPUT->command('message_list.clear'); 
    68                 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text()); 
     68                $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text(), $mbox); 
    6969                $OUTPUT->command('set_unread_count', $mbox, 0); 
    7070                $OUTPUT->command('set_quota', rcmail_quota_content()); 

  • trunk/roundcubemail/program/steps/mail/func.inc

    r5256 r5266  
    321321 
    322322  if ($IMAP->threading) { 
    323     $OUTPUT->command('init_threads', (array) $roots); 
     323    $OUTPUT->command('init_threads', (array) $roots, $mbox); 
    324324  } 
    325325} 

  • trunk/roundcubemail/program/steps/mail/list.inc

    r5233 r5266  
    9797$OUTPUT->set_env('threading', (bool) $IMAP->threading); 
    9898$OUTPUT->set_env('current_page', $count ? $IMAP->list_page : 1); 
    99 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count)); 
     99$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count), $mbox_name); 
    100100$OUTPUT->command('set_mailboxname', rcmail_get_mailbox_name_text()); 
    101101 

  • trunk/roundcubemail/program/steps/mail/mark.inc

    r4410 r5266  
    105105        rcmail_set_unseen_count($mbox, $unseen_count); 
    106106      } 
    107       $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); 
     107      $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox); 
    108108 
    109109      if ($IMAP->threading) 

  • trunk/roundcubemail/program/steps/mail/move_del.inc

    r5233 r5266  
    122122 
    123123  $OUTPUT->command('set_quota', rcmail_quota_content()); 
    124   $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count)); 
     124  $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count), $mbox); 
    125125 
    126126  if ($IMAP->threading) 

  • trunk/roundcubemail/program/steps/mail/search.inc

    r4812 r5266  
    136136$OUTPUT->set_env('messagecount', $count); 
    137137$OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size)); 
    138 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1)); 
     138$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1), $mbox); 
    139139$OUTPUT->send(); 
    140140 
Note: See TracChangeset for help on using the changeset viewer.