diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/func.inc | 19 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 11 |
2 files changed, 15 insertions, 15 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 865aff0bf..418c52b0a 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -161,7 +161,7 @@ function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='') // return html for a structured list <ul> for the mailbox tree function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0) { - global $JS_OBJECT_NAME, $IMAP, $CONFIG, $OUTPUT; + global $JS_OBJECT_NAME, $COMM_PATH, $IMAP, $CONFIG, $OUTPUT; $idx = 0; $out = ''; @@ -190,7 +190,7 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlen // add unread message count display if ($unread_count = $IMAP->messagecount($folder['id'], 'RECENT', ($folder['id']==$mbox))) $foldername .= sprintf(' (%d)', $unread_count); - + // make folder name safe for ids and class names $folder_css = $class_name = preg_replace('/[^a-z0-9\-_]/', '', $folder_lc); @@ -204,13 +204,16 @@ function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlen else if ($folder['id']==$CONFIG['junk_mbox']) $class_name = 'junk'; - $out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="./#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')"%s>%s</a>', + $out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="%s&_mbox=%s"'. + ' onclick="return %s.command(\'list\',\'%s\')"'. + ' onmouseup="return %s.mbox_mouse_up(\'%s\')"%s>%s</a>', $folder_css, $class_name, $zebra_class, $unread_count ? ' unread' : '', $folder['id']==$mbox ? ' selected' : '', - $folder['id'], + $COMM_PATH, + urlencode($folder['id']), $JS_OBJECT_NAME, $folder['id'], $JS_OBJECT_NAME, @@ -295,9 +298,10 @@ function rcmail_message_list($attrib) $a_sort_cols = array('subject', 'date', 'from', 'to'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))) + if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)) + && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; - + // add col definition $out .= '<colgroup>'; $out .= '<col class="icon" />'; @@ -478,7 +482,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE) $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))) + if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)) + && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; // loop through message headers diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index 992d06f79..49b83772b 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -95,18 +95,13 @@ function rcmail_message_attachments($attrib) $attach_prop['filename'], show_bytes($attach_prop['size'])); else - $out .= sprintf('<li><a href="#attachment" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", + $out .= sprintf('<li><a href="%s&_part=%s" onclick="return %s.command(\'load-attachment\',{part:\'%s\', mimetype:\'%s\'},this)">%s</a></li>'."\n", + $GET_URL, + $attach_prop['part_id'], $JS_OBJECT_NAME, $attach_prop['part_id'], $attach_prop['mimetype'], $attach_prop['filename']); - /* direct link - else - $out .= sprintf('<li><a href="%s&_part=%s&_frame=1" target="rcubemailattachment">%s</a></li>'."\n", - $GET_URL, - $attach_prop['part_id'], - $attach_prop['filename']); - */ } $out .= "</ul>"; |