diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 18 | ||||
| -rw-r--r-- | program/steps/mail/move_del.inc | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 52b64d804..f7e094aa0 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -509,7 +509,7 @@ function rcmail_priority_selector($attrib) rcube_label('normal'), rcube_label('high'), rcube_label('highest')), - array(1, 2, 0, 4, 5)); + array(5, 4, 0, 2, 1)); $sel = isset($_POST['_priority']) ? $_POST['_priority'] : 0; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index c0b303a62..98e0cdbbf 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -198,12 +198,16 @@ function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxl $out = ''; foreach ($arrFolders as $key=>$folder) { - // shorten the folder name to a given length - if ($maxlength && $maxlength>1) - $foldername = abbrevate_string($folder['name'], $maxlength); + $folder_lc = strtolower($folder['id']); + if (in_array($folder_lc, $special)) + $foldername = rcube_label($folder_lc); else $foldername = $folder['name']; + // shorten the folder name to a given length + if ($maxlength && $maxlength>1) + $foldername = abbrevate_string($foldername, $maxlength); + $out .= sprintf('<option value="%s">%s%s</option>'."\n", $folder['id'], str_repeat(' ', $nestLevel*4), @@ -303,13 +307,13 @@ function rcmail_message_list($attrib) if ($col=='from' || $col=='to') $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3, $attrib['addicon'])); else if ($col=='subject') - $cont = rep_specialchars_output($IMAP->decode_header($header->$col)); + $cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all'); else if ($col=='size') $cont = show_bytes($header->$col); else if ($col=='date') $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date)); else - $cont = rep_specialchars_output($header->$col); + $cont = rep_specialchars_output($header->$col, 'html', 'all'); $out .= '<td class="'.$col.'">' . $cont . "</td>\n"; } @@ -377,13 +381,13 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) if ($col=='from' || $col=='to') $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3)); else if ($col=='subject') - $cont = rep_specialchars_output($IMAP->decode_header($header->$col)); + $cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all'); else if ($col=='size') $cont = show_bytes($header->$col); else if ($col=='date') $cont = format_date($header->date); //date('m.d.Y G:i:s', strtotime($header->date)); else - $cont = rep_specialchars_output($header->$col); + $cont = rep_specialchars_output($header->$col, 'html', 'all'); $a_msg_cols[$col] = $cont; } diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index 20d46e37d..41b11d5d1 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.inc @@ -65,11 +65,13 @@ $pages = ceil($IMAP->messagecount()/$IMAP->page_size); $commands = sprintf("this.set_rowcount('%s');\n", rcmail_get_messagecount_text()); $commands .= sprintf("this.set_env('pagecount', %d);\n", $pages); - + // update mailboxlist $mbox = $IMAP->get_mailbox_name(); $commands .= sprintf("this.set_unread_count('%s', %d);\n", $mbox, $IMAP->messagecount($mbox, 'UNSEEN')); -$commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN')); + +if ($_action=='moveto') + $commands .= sprintf("this.set_unread_count('%s', %d);\n", $_GET['_target_mbox'], $IMAP->messagecount($_GET['_target_mbox'], 'UNSEEN')); // add new rows from next page (if any) |