From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001 From: yllar <yllar.pajus@gmail.com> Date: Sat, 16 Dec 2006 13:25:16 -0500 Subject: [PATCH] updated ja and fr translations --- program/steps/mail/func.inc | 754 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 428 insertions(+), 326 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index c81dd2f..9bda890 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -21,11 +21,13 @@ require_once('lib/html2text.inc'); require_once('lib/enriched.inc'); -require_once('lib/utf8.inc'); -require_once('lib/utf7.inc'); $EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i'; + +if (empty($_SESSION['mbox'])){ + $_SESSION['mbox'] = $IMAP->get_mailbox_name(); +} // set imap properties and session vars if (strlen($_GET['_mbox'])) @@ -40,6 +42,9 @@ $_SESSION['page'] = $_GET['_page']; } +// set mailbox to INBOX if not set +if (empty($_SESSION['mbox'])) + $_SESSION['mbox'] = $IMAP->get_mailbox_name(); // set default sort col/order to session if (!isset($_SESSION['sort_col'])) @@ -56,11 +61,14 @@ // set current mailbox in client environment $OUTPUT->add_script(sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $IMAP->get_mailbox_name())); - if ($CONFIG['trash_mbox']) $OUTPUT->add_script(sprintf("%s.set_env('trash_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['trash_mbox'])); +if ($CONFIG['drafts_mbox']) + $OUTPUT->add_script(sprintf("%s.set_env('drafts_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['drafts_mbox'])); +if ($CONFIG['junk_mbox']) + $OUTPUT->add_script(sprintf("%s.set_env('junk_mailbox', '%s');", $JS_OBJECT_NAME, $CONFIG['junk_mbox'])); // return the mailboxlist in HTML function rcmail_mailbox_list($attrib) @@ -68,6 +76,12 @@ global $IMAP, $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $COMM_PATH; static $s_added_script = FALSE; static $a_mailboxes; + + // add some labels to client + rcube_add_label('purgefolderconfirm'); + rcube_add_label('deletemessagesconfirm'); + +// $mboxlist_start = rcube_timer(); $type = $attrib['type'] ? $attrib['type'] : 'ul'; $add_attrib = $type=='select' ? array('style', 'class', 'id', 'name', 'onchange') : @@ -87,7 +101,7 @@ rcube_label($attrib['noselection'])); // get mailbox list - $mbox = $IMAP->get_mailbox_name(); + $mbox_name = $IMAP->get_mailbox_name(); // for these mailboxes we have localized labels $special_mailboxes = array('inbox', 'sent', 'drafts', 'trash', 'junk'); @@ -100,7 +114,9 @@ $a_folders = $IMAP->list_mailboxes(); $delimiter = $IMAP->get_hierarchy_delimiter(); $a_mailboxes = array(); - + +// rcube_print_time($mboxlist_start, 'list_mailboxes()'); + foreach ($a_folders as $folder) rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter); } @@ -108,9 +124,11 @@ // var_dump($a_mailboxes); if ($type=='select') - $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']); + $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox_name, $attrib['maxlength']); else - $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']); + $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox_name, $attrib['maxlength']); + +// rcube_print_time($mboxlist_start, 'render_folder_tree()'); if ($type=='ul') @@ -142,7 +160,7 @@ if (!isset($arrFolders[$currentFolder])) { $arrFolders[$currentFolder] = array('id' => $path, - 'name' => $currentFolder, + 'name' => rcube_charset_convert($currentFolder, 'UTF-7'), 'folders' => array()); } @@ -152,32 +170,38 @@ // return html for a structured list <ul> for the mailbox tree -function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0) +function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox_name, $maxlength, $nestLevel=0) { - global $JS_OBJECT_NAME, $IMAP, $CONFIG; + global $JS_OBJECT_NAME, $COMM_PATH, $IMAP, $CONFIG, $OUTPUT; $idx = 0; $out = ''; foreach ($arrFolders as $key => $folder) { $zebra_class = ($nestLevel*$idx)%2 ? 'even' : 'odd'; + $title = ''; $folder_lc = strtolower($folder['id']); if (in_array($folder_lc, $special)) $foldername = rcube_label($folder_lc); else { - $foldername = UTF7DecodeString($folder['name']); + $foldername = $folder['name']; // shorten the folder name to a given length if ($maxlength && $maxlength>1) - $foldername = abbrevate_string($foldername, $maxlength); + { + $fname = abbrevate_string($foldername, $maxlength); + if ($fname != $foldername) + $title = ' title="'.rep_specialchars_output($foldername, 'html', 'all').'"'; + $foldername = $fname; + } } // add unread message count display - if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN', ($folder['id']==$mbox))) + if ($unread_count = $IMAP->messagecount($folder['id'], 'RECENT', ($folder['id']==$mbox_name))) $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); @@ -191,21 +215,32 @@ 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</a>', + $js_name = htmlspecialchars(rep_specialchars_output($folder['id'], 'js')); + $out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="%s&_mbox=%s"'. + ' onclick="return %s.command(\'list\',\'%s\')"'. + ' onmouseover="return %s.focus_mailbox(\'%s\')"' . + ' onmouseout="return %s.unfocus_mailbox(\'%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'], + $folder['id']==$mbox_name ? ' selected' : '', + $COMM_PATH, + urlencode($folder['id']), $JS_OBJECT_NAME, - $folder['id'], + $js_name, $JS_OBJECT_NAME, - $folder['id'], + $js_name, + $JS_OBJECT_NAME, + $js_name, + $JS_OBJECT_NAME, + $js_name, + $title, rep_specialchars_output($foldername, 'html', 'all')); if (!empty($folder['folders'])) - $out .= "\n<ul>\n" . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1) . "</ul>\n"; + $out .= "\n<ul>\n" . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1) . "</ul>\n"; $out .= "</li>\n"; $idx++; @@ -216,9 +251,9 @@ // return html for a flat list <select> for the mailbox tree -function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0) +function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox_name, $maxlength, $nestLevel=0) { - global $IMAP; + global $IMAP, $OUTPUT; $idx = 0; $out = ''; @@ -229,7 +264,7 @@ $foldername = rcube_label($folder_lc); else { - $foldername = UTF7DecodeString($folder['name']); + $foldername = $folder['name']; // shorten the folder name to a given length if ($maxlength && $maxlength>1) @@ -237,12 +272,12 @@ } $out .= sprintf('<option value="%s">%s%s</option>'."\n", - $folder['id'], + htmlspecialchars($folder['id']), str_repeat(' ', $nestLevel*4), rep_specialchars_output($foldername, 'html', 'all')); if (!empty($folder['folders'])) - $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1); + $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1); $idx++; } @@ -262,6 +297,9 @@ // check to see if we have some settings for sorting $sort_col = $_SESSION['sort_col']; $sort_order = $_SESSION['sort_order']; + + // add some labels to client + rcube_add_label('from', 'to'); // get message headers $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order); @@ -278,20 +316,21 @@ // define list of cols to be displayed $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject'); - $a_sort_cols = array('subject', 'date', 'from', 'to'); + $a_sort_cols = array('subject', 'date', 'from', 'to', 'size'); // show 'to' instead of from in sent messages - if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))) + if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) && ($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">'; + $out .= '<col class="icon" />'; foreach ($a_show_cols as $col) - $out .= sprintf('<col class="%s">', $col); + $out .= sprintf('<col class="%s" />', $col); - $out .= '<col class="icon">'; + $out .= '<col class="icon" />'; $out .= "</colgroup>\n"; // add table title @@ -352,7 +391,6 @@ $out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n"; $out .= "</tr></thead>\n<tbody>\n"; - // no messages in this mailbox if (!sizeof($a_headers)) { @@ -373,13 +411,16 @@ $zebra_class = $i%2 ? 'even' : 'odd'; // set messag attributes to javascript array + if ($header->deleted) + $js_row_arr['deleted'] = true; if (!$header->seen) $js_row_arr['unread'] = true; if ($header->answered) $js_row_arr['replied'] = true; - - // set message icon - if ($attrib['unreadicon'] && !$header->seen) + // set message icon + if ($attrib['deletedicon'] && $header->deleted) + $message_icon = $attrib['deletedicon']; + else if ($attrib['unreadicon'] && !$header->seen) $message_icon = $attrib['unreadicon']; else if ($attrib['repliedicon'] && $header->answered) $message_icon = $attrib['repliedicon']; @@ -387,10 +428,15 @@ $message_icon = $attrib['messageicon']; // set attachment icon - if ($attrib['attachmenticon'] && preg_match("/multipart\/m/i", $header->ctype)) + if ($attrib['attachmenticon'] && preg_match("/multipart\/[mr]/i", $header->ctype)) $attach_icon = $attrib['attachmenticon']; - $out .= sprintf('<tr id="rcmrow%d" class="message'.($header->seen ? '' : ' unread').' '.$zebra_class.'">'."\n", $header->uid); + $out .= sprintf('<tr id="rcmrow%d" class="message%s%s %s">'."\n", + $header->uid, + $header->seen ? '' : ' unread', + $header->deleted ? ' deleted' : '', + $zebra_class); + $out .= sprintf("<td class=\"icon\">%s</td>\n", $message_icon ? sprintf($image_tag, $skin_path, $message_icon, '') : ''); // format each col @@ -399,7 +445,11 @@ 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), 'html', 'all'); + // firefox/mozilla temporary workaround to pad subject with content so that whitespace in rows responds to drag+drop + $cont .= '<img src="./program/blank.gif" height="5" width="1000" alt="" />'; + } else if ($col=='size') $cont = show_bytes($header->$col); else if ($col=='date') @@ -424,6 +474,7 @@ $message_count = $IMAP->messagecount(); // set client env + $javascript .= sprintf("%s.gui_object('mailcontframe', '%s');\n", $JS_OBJECT_NAME, 'mailcontframe'); $javascript .= sprintf("%s.gui_object('messagelist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']); $javascript .= sprintf("%s.set_env('messagecount', %d);\n", $JS_OBJECT_NAME, $message_count); $javascript .= sprintf("%s.set_env('current_page', %d);\n", $JS_OBJECT_NAME, $IMAP->list_page); @@ -433,6 +484,8 @@ if ($attrib['messageicon']) $javascript .= sprintf("%s.set_env('messageicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['messageicon']); + if ($attrib['deletedicon']) + $javascript .= sprintf("%s.set_env('deletedicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['deletedicon']); if ($attrib['unreadicon']) $javascript .= sprintf("%s.set_env('unreadicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['unreadicon']); if ($attrib['repliedicon']) @@ -443,6 +496,7 @@ $javascript .= sprintf("%s.set_env('messages', %s);", $JS_OBJECT_NAME, array2js($a_js_message_arr)); $OUTPUT->add_script($javascript); + $OUTPUT->include_script('list.js'); return $out; } @@ -459,8 +513,11 @@ $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 (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) + && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols)) $a_show_cols[$f] = 'to'; + + $commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols)); // loop through message headers for ($n=0; $a_headers[$n]; $n++) @@ -473,7 +530,7 @@ foreach ($a_show_cols as $col) { if ($col=='from' || $col=='to') - $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3)); + $cont = rep_specialchars_output(rcmail_address_string($header->$col, 3), 'html'); else if ($col=='subject') $cont = rep_specialchars_output($IMAP->decode_header($header->$col), 'html', 'all'); else if ($col=='size') @@ -486,19 +543,71 @@ $a_msg_cols[$col] = $cont; } + $a_msg_flags['deleted'] = $header->deleted ? 1 : 0; $a_msg_flags['unread'] = $header->seen ? 0 : 1; $a_msg_flags['replied'] = $header->answered ? 1 : 0; - - $commands .= sprintf("this.add_message_row(%s, %s, %s, %b);\n", + $commands .= sprintf("this.add_message_row(%s, %s, %s, %b, %b);\n", $header->uid, array2js($a_msg_cols), array2js($a_msg_flags), - preg_match("/multipart\/m/i", $header->ctype)); + preg_match("/multipart\/m/i", $header->ctype), + $insert_top); } return $commands; } + +// return an HTML iframe for loading mail content +function rcmail_messagecontent_frame($attrib) + { + global $OUTPUT, $JS_OBJECT_NAME; + + if (empty($attrib['id'])) + $attrib['id'] = 'rcmailcontentwindow'; + + // allow the following attributes to be added to the <iframe> tag + $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')); + $framename = $attrib['id']; + + $out = sprintf('<iframe name="%s"%s></iframe>'."\n", + $framename, + $attrib_str); + + $OUTPUT->add_script("$JS_OBJECT_NAME.set_env('contentframe', '$framename');"); + + return $out; + } + +// return code for search function +function rcmail_search_form($attrib) + { + global $OUTPUT, $JS_OBJECT_NAME; + + // add some labels to client + rcube_add_label('searching'); + + $attrib['name'] = '_q'; + + if (empty($attrib['id'])) + $attrib['id'] = 'rcmqsearchbox'; + + $input_q = new textfield($attrib); + $out = $input_q->show(); + + $OUTPUT->add_script(sprintf("%s.gui_object('qsearchbox', '%s');", + $JS_OBJECT_NAME, + $attrib['id'])); + + // add form tag around text field + if (empty($attrib['form'])) + $out = sprintf('<form name="rcmqsearchform" action="./" '. + 'onsubmit="%s.command(\'search\');return false" style="display:inline;">%s</form>', + $JS_OBJECT_NAME, + $out); + + return $out; + } function rcmail_messagecount_display($attrib) @@ -508,7 +617,9 @@ if (!$attrib['id']) $attrib['id'] = 'rcmcountdisplay'; - $OUTPUT->add_script(sprintf("%s.gui_object('countdisplay', '%s');", $JS_OBJECT_NAME, $attrib['id'])); + $OUTPUT->add_script(sprintf("%s.gui_object('countdisplay', '%s');", + $JS_OBJECT_NAME, + $attrib['id'])); // allow the following attributes to be added to the <span> tag $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id')); @@ -521,21 +632,68 @@ } +function rcmail_quota_display($attrib) + { + global $IMAP, $OUTPUT, $JS_OBJECT_NAME, $COMM_PATH; -function rcmail_get_messagecount_text() + if (!$attrib['id']) + $attrib['id'] = 'rcmquotadisplay'; + + $OUTPUT->add_script(sprintf("%s.gui_object('quotadisplay', '%s');", $JS_OBJECT_NAME, $attrib['id'])); + + // allow the following attributes to be added to the <span> tag + $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id')); + + if (!$IMAP->get_capability('QUOTA')) + $quota_text = rcube_label('unknown'); + else if ($quota = $IMAP->get_quota()) + { + $quota_text = sprintf("%s / %s (%.0f%%)", + show_bytes($quota["used"] * 1024), + show_bytes($quota["total"] * 1024), + $quota["percent"]); + + // show quota as image (by Brett Patterson) + if ($attrib['display'] == 'image' && function_exists('imagegif')) + { + $attrib += array('width' => 100, 'height' => 14); + $quota_text = sprintf('<img src="%s&_action=quotaimg&u=%s&q=%d&w=%d&h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />', + $COMM_PATH, + $quota['used'], $quota['total'], + $attrib['width'], $attrib['height'], + $attrib['width'], $attrib['height'], + $quota_text, + show_bytes($quota["used"] * 1024), + show_bytes($quota["total"] * 1024)); + } + } + else + $quota_text = rcube_label('unlimited'); + + + $out = '<span' . $attrib_str . '>'; + $out .= $quota_text; + $out .= '</span>'; + return $out; + } + + +function rcmail_get_messagecount_text($count=NULL, $page=NULL) { global $IMAP, $MESSAGE; if (isset($MESSAGE['index'])) { - $a_msg_index = $IMAP->message_index(); return rcube_label(array('name' => 'messagenrof', 'vars' => array('nr' => $MESSAGE['index']+1, - 'count' => sizeof($a_msg_index)))); + 'count' => $count!==NULL ? $count : $IMAP->messagecount()))); } - - $start_msg = ($IMAP->list_page-1) * $IMAP->page_size + 1; - $max = $IMAP->messagecount(); + + if ($page===NULL) + $page = $IMAP->list_page; + + $start_msg = ($page-1) * $IMAP->page_size + 1; + $max = $count!==NULL ? $count : $IMAP->messagecount(); if ($max==0) $out = rcube_label('mailboxempty'); @@ -549,35 +707,32 @@ } -function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) // $body, $ctype_primary='text', $ctype_secondary='plain', $encoding='7bit', $safe=FALSE, $plain=FALSE) +function rcmail_print_body($part, $safe=FALSE, $plain=FALSE) { global $IMAP, $REMOTE_OBJECTS, $JS_OBJECT_NAME; - - // extract part properties: body, ctype_primary, ctype_secondary, encoding, parameters - extract($part); - $block = $plain ? '%s' : '%s'; //'<div style="display:block;">%s</div>'; - $body = $IMAP->mime_decode($body, $encoding); - $body = $IMAP->charset_decode($body, $parameters); - + $body = is_array($part->replaces) ? strtr($part->body, $part->replaces) : $part->body; // text/html - if ($ctype_secondary=='html') + if ($part->ctype_secondary=='html') { + // remove charset specification in HTML message + $body = preg_replace('/charset=[a-z0-9\-]+/i', '', $body); + if (!$safe) // remove remote images and scripts { - $remote_patterns = array('/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui', - // '/(src|background)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Ui', + $remote_patterns = array('/<img\s+(.*)src=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui', + '/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui', '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i', '/(<link.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i', '/url\s*\(["\']?([hftps]{3,5}:\/{2}[^"\'\s]+)["\']?\)/i', '/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i', '/<script.+<\/script>/Umis'); - $remote_replaces = array('', // '\\1=\\2#\\4', - // '\\1=\\2#\\4', + $remote_replaces = array('<img \\1src=\\2./program/blank.gif\\4', '', - '', // '\\1#\\3', + '', + '', 'none', 'none', ''); @@ -595,21 +750,20 @@ $body = preg_replace($remote_patterns, $remote_replaces, $body); } - return sprintf($block, rep_specialchars_output($body, 'html', '', FALSE)); + return rep_specialchars_output($body, 'html', '', FALSE); } // text/enriched - if ($ctype_secondary=='enriched') + if ($part->ctype_secondary=='enriched') { - $body = enriched_to_html($body); - return sprintf($block, rep_specialchars_output($body, 'html')); + return rep_specialchars_output(enriched_to_html($body), 'html'); } else { // make links and email-addresses clickable $convert_patterns = $convert_replaces = $replace_strings = array(); - $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:'; + $url_chars = 'a-z0-9_\-\+\*\$\/&%=@#:;'; $url_chars_within = '\?\.~,!'; $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie"; @@ -620,39 +774,44 @@ $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie'; $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)"; + + if ($part->ctype_parameters['format'] != 'flowed') + $body = wordwrap(trim($body), 80); - $body = wordwrap(trim($body), 80); $body = preg_replace($convert_patterns, $convert_replaces, $body); // split body into single lines $a_lines = preg_split('/\r?\n/', $body); + $quote_level = 0; // colorize quoted parts for($n=0; $n<sizeof($a_lines); $n++) { $line = $a_lines[$n]; + $quotation = ''; + $q = 0; + + if (preg_match('/^(>+\s*)/', $line, $regs)) + { + $q = strlen(preg_replace('/\s/', '', $regs[1])); + $line = substr($line, strlen($regs[1])); - if ($line{2}=='>') - $color = 'red'; - else if ($line{1}=='>') - $color = 'green'; - else if ($line{0}=='>') - $color = 'blue'; - else - $color = FALSE; + if ($q > $quote_level) + $quotation = str_repeat('<blockquote>', $q - $quote_level); + else if ($q < $quote_level) + $quotation = str_repeat("</blockquote>", $quote_level - $q); + } + else if ($quote_level > 0) + $quotation = str_repeat("</blockquote>", $quote_level); - $line = rep_specialchars_output($line, 'html', 'replace', FALSE); - - if ($color) - $a_lines[$n] = sprintf('<font color="%s">%s</font>', $color, $line); - else - $a_lines[$n] = $line; + $quote_level = $q; + $a_lines[$n] = $quotation . rep_specialchars_output($line, 'html', 'replace', FALSE); } // insert the links for urls and mailtos $body = preg_replace("/##string_replacement\{([0-9]+)\}##/e", "\$replace_strings[\\1]", join("\n", $a_lines)); - return sprintf($block, "<pre>\n".$body."\n</pre>"); + return "<div class=\"pre\">".$body."\n</div>"; } } @@ -667,7 +826,7 @@ } -function rcmail_parse_message($structure, $arg=array(), $recursive=FALSE) +function rcmail_parse_message(&$structure, $arg=array(), $recursive=FALSE) { global $IMAP; static $sa_inline_objects = array(); @@ -684,18 +843,18 @@ // show message headers if ($recursive && is_array($structure->headers) && isset($structure->headers['subject'])) - $a_return_parts[] = array('type' => 'headers', - 'headers' => $structure->headers); + { + $c = new stdClass; + $c->type = 'headers'; + $c->headers = &$structure->headers; + $a_return_parts[] = $c; + } // print body if message doesn't have multiple parts if ($message_ctype_primary=='text') { - $a_return_parts[] = array('type' => 'content', - 'body' => $structure->body, - 'ctype_primary' => $message_ctype_primary, - 'ctype_secondary' => $message_ctype_secondary, - 'parameters' => $structure->ctype_parameters, - 'encoding' => $structure->headers['content-transfer-encoding']); + $structure->type = 'content'; + $a_return_parts[] = &$structure; } // message contains alternative parts @@ -730,49 +889,52 @@ // print html/plain part else if ($html_part!==NULL && $prefer_html) - $print_part = $structure->parts[$html_part]; + $print_part = &$structure->parts[$html_part]; else if ($enriched_part!==NULL) - $print_part = $structure->parts[$enriched_part]; + $print_part = &$structure->parts[$enriched_part]; else if ($plain_part!==NULL) - $print_part = $structure->parts[$plain_part]; + $print_part = &$structure->parts[$plain_part]; // show message body if (is_object($print_part)) - $a_return_parts[] = array('type' => 'content', - 'body' => $print_part->body, - 'ctype_primary' => strtolower($print_part->ctype_primary), - 'ctype_secondary' => strtolower($print_part->ctype_secondary), - 'parameters' => $print_part->ctype_parameters, - 'encoding' => $print_part->headers['content-transfer-encoding']); + { + $print_part->type = 'content'; + $a_return_parts[] = $print_part; + } // show plaintext warning else if ($html_part!==NULL) - $a_return_parts[] = array('type' => 'content', - 'body' => rcube_label('htmlmessage'), - 'ctype_primary' => 'text', - 'ctype_secondary' => 'plain'); + { + $c = new stdClass; + $c->type = 'content'; + $c->body = rcube_label('htmlmessage'); + $c->ctype_primary = 'text'; + $c->ctype_secondary = 'plain'; + + $a_return_parts[] = $c; + } // add html part as attachment if ($html_part!==NULL && $structure->parts[$html_part]!==$print_part) { - $html_part = $structure->parts[$html_part]; - $a_attachments[] = array('filename' => rcube_label('htmlmessage'), - 'encoding' => $html_part->headers['content-transfer-encoding'], - 'mimetype' => 'text/html', - 'part_id' => $html_part->mime_id, - 'size' => strlen($IMAP->mime_decode($html_part->body, $html_part->headers['content-transfer-encoding']))); + $html_part = &$structure->parts[$html_part]; + $html_part->filename = rcube_label('htmlmessage'); + $html_part->mimetype = 'text/html'; + + $a_attachments[] = $html_part; } } // message contains multiple parts - else if ($message_ctype_primary=='multipart' && is_array($structure->parts)) + else if (is_array($structure->parts) && !empty($structure->parts)) { - foreach ($structure->parts as $mail_part) + for ($i=0; $i<count($structure->parts); $i++) { + $mail_part = &$structure->parts[$i]; $primary_type = strtolower($mail_part->ctype_primary); $secondary_type = strtolower($mail_part->ctype_secondary); // multipart/alternative - if ($primary_type=='multipart') // && ($secondary_type=='alternative' || $secondary_type=='mixed' || $secondary_type=='related')) + if ($primary_type=='multipart') { list($parts, $attachmnts) = rcmail_parse_message($mail_part, $arg, TRUE); @@ -781,59 +943,45 @@ } // part text/[plain|html] OR message/delivery-status - else if (($primary_type=='text' && ($secondary_type=='plain' || $secondary_type=='html')) || + else if (($primary_type=='text' && ($secondary_type=='plain' || $secondary_type=='html') && $mail_part->disposition!='attachment') || ($primary_type=='message' && $secondary_type=='delivery-status')) { - $a_return_parts[] = array('type' => 'content', - 'body' => $mail_part->body, - 'ctype_primary' => $primary_type, - 'ctype_secondary' => $secondary_type, - 'parameters' => $mail_part->ctype_parameters, - 'encoding' => $mail_part->headers['content-transfer-encoding']); + $mail_part->type = 'content'; + $a_return_parts[] = $mail_part; } // part message/* else if ($primary_type=='message') { - /* don't parse headers here; they're parsed within the recursive call to rcmail_parse_message() - if ($mail_part->parts[0]->headers) - $a_return_parts[] = array('type' => 'headers', - 'headers' => $mail_part->parts[0]->headers); - */ - - list($parts, $attachmnts) = rcmail_parse_message($mail_part->parts[0], $arg, TRUE); - + list($parts, $attachmnts) = rcmail_parse_message($mail_part, $arg, TRUE); + $a_return_parts = array_merge($a_return_parts, $parts); $a_attachments = array_merge($a_attachments, $attachmnts); } // part is file/attachment else if ($mail_part->disposition=='attachment' || $mail_part->disposition=='inline' || $mail_part->headers['content-id'] || - (empty($mail_part->disposition) && ($mail_part->d_parameters['filename'] || $mail_part->d_parameters['name']))) + (empty($mail_part->disposition) && ($mail_part->d_parameters['filename'] || $mail_part->ctype_parameters['name']))) { - if ($message_ctype_secondary=='related' && $mail_part->headers['content-id']) - $sa_inline_objects[] = array('filename' => rcube_imap::decode_mime_string($mail_part->d_parameters['filename']), - 'mimetype' => strtolower("$primary_type/$secondary_type"), - 'part_id' => $mail_part->mime_id, - 'content_id' => preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id'])); + // skip apple ressource files + if ($message_ctype_secondary=='appledouble' && $secondary_type=='applefile') + continue; - else if ($mail_part->d_parameters['filename']) - $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->d_parameters['filename']), - 'encoding' => strtolower($mail_part->headers['content-transfer-encoding']), - 'mimetype' => strtolower("$primary_type/$secondary_type"), - 'part_id' => $mail_part->mime_id, - 'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*, - 'content' => $mail_part->body */); - - else if ($mail_part->ctype_parameters['name']) - $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->ctype_parameters['name']), - 'encoding' => strtolower($mail_part->headers['content-transfer-encoding']), - 'mimetype' => strtolower("$primary_type/$secondary_type"), - 'part_id' => $mail_part->mime_id, - 'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*, - 'content' => $mail_part->body */); - - + // part belongs to a related message + if ($message_ctype_secondary=='related' && $mail_part->headers['content-id']) + { + $mail_part->filename = rcube_imap::decode_mime_string($mail_part->d_parameters['filename']); + $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']); + $sa_inline_objects[] = $mail_part; + } + // is regular attachment + else if (($fname = $mail_part->d_parameters['filename']) || + ($fname = $mail_part->ctype_parameters['name']) || + ($fname = $mail_part->headers['content-description'])) + { + $mail_part->filename = rcube_imap::decode_mime_string($fname); + $a_attachments[] = $mail_part; + } } } @@ -841,30 +989,20 @@ // if this was a related part try to resolve references if ($message_ctype_secondary=='related' && sizeof($sa_inline_objects)) { - $a_replace_patters = array(); - $a_replace_strings = array(); + $a_replaces = array(); foreach ($sa_inline_objects as $inline_object) - { - $a_replace_patters[] = 'cid:'.$inline_object['content_id']; - $a_replace_strings[] = sprintf($get_url, $inline_object['part_id']); - } + $a_replaces['cid:'.$inline_object->content_id] = htmlspecialchars(sprintf($get_url, $inline_object->mime_id)); - foreach ($a_return_parts as $i => $return_part) + // add replace array to each content part + // (will be applied later when part body is available) + for ($i=0; $i<count($a_return_parts); $i++) { - if ($return_part['type']!='content') - continue; - - // decode body and replace cid:... - $a_return_parts[$i]['body'] = str_replace($a_replace_patters, $a_replace_strings, $IMAP->mime_decode($return_part['body'], $return_part['encoding'])); - $a_return_parts[$i]['encoding'] = '7bit'; + if ($a_return_parts[$i]->type=='content') + $a_return_parts[$i]->replaces = $a_replaces; } } } - - - // join all parts together - //$out .= join($part_delimiter, $a_return_parts); return array($a_return_parts, $a_attachments); } @@ -899,7 +1037,7 @@ $out = '<table' . $attrib_str . ">\n"; // show these headers - $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'reply-to', 'date'); + $standard_headers = array('subject', 'from', 'organization', 'to', 'cc', 'bcc', 'reply-to', 'date'); foreach ($standard_headers as $hkey) { @@ -908,8 +1046,8 @@ if ($hkey=='date' && !empty($headers[$hkey])) $header_value = format_date(strtotime($headers[$hkey])); - else if (in_array($hkey, array('from', 'to', 'cc', 'reply-to'))) - $header_value = rep_specialchars_output(rcmail_address_string($IMAP->decode_header($headers[$hkey]), NULL, $attrib['addicon'])); + else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to'))) + $header_value = rep_specialchars_output(rcmail_address_string($headers[$hkey], NULL, $attrib['addicon'])); else $header_value = rep_specialchars_output($IMAP->decode_header($headers[$hkey]), '', 'all'); @@ -928,7 +1066,7 @@ function rcmail_message_body($attrib) { - global $CONFIG, $OUTPUT, $MESSAGE, $GET_URL, $REMOTE_OBJECTS, $JS_OBJECT_NAME; + global $CONFIG, $OUTPUT, $MESSAGE, $IMAP, $GET_URL, $REMOTE_OBJECTS, $JS_OBJECT_NAME; if (!is_array($MESSAGE['parts']) && !$MESSAGE['body']) return ''; @@ -950,27 +1088,37 @@ // -> create a plaintext body with the according message if (!sizeof($MESSAGE['parts']) && $MESSAGE['headers']->ctype=='multipart/encrypted') { - $MESSAGE['parts'][0] = array('type' => 'content', - 'ctype_primary' => 'text', - 'ctype_secondary' => 'plain', - 'body' => rcube_label('encryptedmessage')); + $p = new stdClass; + $p->type = 'content'; + $p->ctype_primary = 'text'; + $p->ctype_secondary = 'plain'; + $p->body = rcube_label('encryptedmessage'); + $MESSAGE['parts'][0] = $p; } if ($MESSAGE['parts']) { foreach ($MESSAGE['parts'] as $i => $part) { - if ($part['type']=='headers') - $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part['headers']); - else if ($part['type']=='content') + if ($part->type=='headers') + $out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part->headers); + else if ($part->type=='content') { - if (empty($part['parameters']) || empty($part['parameters']['charset'])) - $part['parameters']['charset'] = $MESSAGE['headers']->charset; - - // $body = rcmail_print_body($part['body'], $part['ctype_primary'], $part['ctype_secondary'], $part['encoding'], $safe_mode); + if (empty($part->ctype_parameters) || empty($part->ctype_parameters['charset'])) + $part->ctype_parameters['charset'] = $MESSAGE['headers']->charset; + + // fetch part if not available + if (!isset($part->body)) + $part->body = $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part); + $body = rcmail_print_body($part, $safe_mode); $out .= '<div class="message-part">'; - $out .= rcmail_mod_html_body($body, $attrib['id']); + + if ($part->ctype_secondary != 'plain') + $out .= rcmail_mod_html_body($body, $attrib['id']); + else + $out .= $body; + $out .= "</div>\n"; } } @@ -988,11 +1136,11 @@ { foreach ($MESSAGE['attachments'] as $attach_prop) { - if (strpos($attach_prop['mimetype'], 'image/')===0) - $out .= sprintf("\n<hr />\n<p align=\"center\"><img src=\"%s&_part=%s\" alt=\"%s\" title=\"%s\" /></p>\n", - $GET_URL, $attach_prop['part_id'], - $attach_prop['filename'], - $attach_prop['filename']); + if (strpos($attach_prop->mimetype, 'image/')===0) + $out .= sprintf("\n<hr />\n<p align=\"center\"><img src=\"%s&_part=%s\" alt=\"%s\" title=\"%s\" /></p>\n", + htmlspecialchars($GET_URL), $attach_prop->mime_id, + $attach_prop->filename, + $attach_prop->filename); } } @@ -1009,21 +1157,21 @@ // modify a HTML message that it can be displayed inside a HTML page function rcmail_mod_html_body($body, $container_id) { + // remove any null-byte characters before parsing + $body = preg_replace('/\x00/', '', $body); + $last_style_pos = 0; $body_lc = strtolower($body); // find STYLE tags while (($pos = strpos($body_lc, '<style', $last_style_pos)) && ($pos2 = strpos($body_lc, '</style>', $pos))) { - $pos2 += 8; - $body_pre = substr($body, 0, $pos); - $styles = substr($body, $pos, $pos2-$pos); - $body_post = substr($body, $pos2, strlen($body)-$pos2); - + $pos = strpos($body_lc, '>', $pos)+1; + // replace all css definitions with #container [def] - $styles = rcmail_mod_css_styles($styles, $container_id); - - $body = $body_pre . $styles . $body_post; + $styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id); + + $body = substr($body, 0, $pos) . $styles . substr($body, $pos2); $last_style_pos = $pos2; } @@ -1051,25 +1199,42 @@ $body = preg_replace('/(url\s*\()(["\']?)([\.\/]+[^"\'\)\s]+)(\2)\)/Uie', "'\\1\''.make_absolute_url('\\3', '$base_url').'\')'", $body); $body = preg_replace($base_reg, '', $body); } + + // modify HTML links to open a new window if clicked + $body = preg_replace('/<a\s+([^>]+)>/Uie', "rcmail_alter_html_link('\\1');", $body); // add comments arround html and other tags $out = preg_replace(array('/(<\/?html[^>]*>)/i', '/(<\/?head[^>]*>)/i', - '/(<title[^>]*>.+<\/title>)/ui', + '/(<title[^>]*>.*<\/title>)/Ui', '/(<\/?meta[^>]*>)/i'), '<!--\\1-->', $body); - + $out = preg_replace(array('/(<body[^>]*>)/i', '/(<\/body>)/i'), array('<div class="rcmBody">', '</div>'), $out); - return $out; } + +// parse link attributes and set correct target +function rcmail_alter_html_link($in) + { + $attrib = parse_attrib_string($in); + + if (stristr((string)$attrib['href'], 'mailto:')) + $attrib['onclick'] = sprintf("return %s.command('compose','%s',this)", + $GLOBALS['JS_OBJECT_NAME'], + substr($attrib['href'], 7)); + else if (!empty($attrib['href']) && $attrib['href']{0}!='#') + $attrib['target'] = '_blank'; + + return '<a' . create_attrib_string($attrib, array('href', 'name', 'target', 'onclick', 'id', 'class', 'style', 'title')) . '>'; + } // replace all css definitions with #container [def] @@ -1097,125 +1262,88 @@ } +function rcmail_has_html_part($message_parts) +{ + if (!is_array($message_parts)) + return FALSE; -// return first text part of a message -function rcmail_first_text_part($message_parts) + // check all message parts + foreach ($message_parts as $pid => $part) + { + $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary); + if ($mimetype=='text/html') + { + return TRUE; + } + } + + return FALSE; +} + +// return first HTML part of a message +function rcmail_first_html_part($message_struct) { - if (!is_array($message_parts)) + global $IMAP; + + if (!is_array($message_struct['parts'])) return FALSE; $html_part = NULL; - + // check all message parts - foreach ($message_parts as $pid => $part) + foreach ($message_struct['parts'] as $pid => $part) { $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary); - if ($mimetype=='text/plain') + if ($mimetype=='text/html') { - $body = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']); - $body = rcube_imap::charset_decode($body, $part->ctype_parameters); - return $body; - } - else if ($mimetype=='text/html') - { - $html_part = rcube_imap::mime_decode($part->body, $part->headers['content-transfer-encoding']); - $html_part = rcube_imap::charset_decode($html_part, $part->ctype_parameters); + $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part); } } - - // convert HTML to plain text if ($html_part) - { + { // remove special chars encoding - $trans = array_flip(get_html_translation_table(HTML_ENTITIES)); - $html_part = strtr($html_part, $trans); + //$trans = array_flip(get_html_translation_table(HTML_ENTITIES)); + //$html_part = strtr($html_part, $trans); - // create instance of html2text class - $txt = new html2text($html_part); - return $txt->get_text(); + return $html_part; } return FALSE; - } +} -// get source code of a specific message and cache it -function rcmail_message_source($uid) +// return first text part of a message +function rcmail_first_text_part($message_struct) { - global $IMAP, $DB, $CONFIG; + global $IMAP; - // get message ID if uid is given - $cache_key = $IMAP->mailbox.'.msg'; - $cached = $IMAP->get_cached_message($cache_key, $uid, FALSE); - - // message is cached in database - if ($cached && !empty($cached->body)) - return $cached->body; + if (empty($message_struct['parts'])) + return $message_struct['UID'] ? $IMAP->get_body($message_struct['UID']) : false; - if (!$cached) - $headers = $IMAP->get_headers($uid); - else - $headers = &$cached; - - - $message_id = $headers->messageID; - - $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : ''); - $cache_dir = $temp_dir.$_SESSION['client_id']; - $cache_path = $cache_dir.'/'.$message_id; - - // message is cached in temp dir - if (is_dir($cache_dir) && is_file($cache_path)) + // check all message parts + foreach ($message_struct['parts'] as $pid => $part) { - if ($fp = fopen($cache_path, 'r')) + $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary); + + if ($mimetype=='text/plain') + return $IMAP->get_message_part($message_struct['UID'], $pid, $part); + + else if ($mimetype=='text/html') { - $msg_source = fread($fp, filesize($cache_path)); - fclose($fp); - return $msg_source; + $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part); + + // remove special chars encoding + $trans = array_flip(get_html_translation_table(HTML_ENTITIES)); + $html_part = strtr($html_part, $trans); + + // create instance of html2text class + $txt = new html2text($html_part); + return $txt->get_text(); } } - - // get message from server - $msg_source = $IMAP->get_raw_body($uid); - - // let's cache the message body within the database - if ($CONFIG['enable_caching'] && $cached && ($CONFIG['db_max_length'] -300) > $headers->size) - { - $DB->query("UPDATE ".get_table_name('messages')." - SET body=? - WHERE user_id=? - AND cache_key=? - AND uid=?", - $msg_source, - $_SESSION['user_id'], - $cache_key, - $uid); - - return $msg_source; - } - - - // create dir for caching - if (!is_dir($cache_dir)) - $dir = mkdir($cache_dir); - else - $dir = true; - - // attempt to write a file with the message body - if ($dir && ($fp = fopen($cache_path, 'w'))) - { - fwrite($fp, $msg_source); - fclose($fp); - } - else - { - raise_error(array('code' => 403, 'type' => 'php', 'line' => __LINE__, 'file' => __FILE__, - 'message' => "Failed to write to temp dir"), TRUE, FALSE); - } - - return $msg_source; + return FALSE; } @@ -1284,19 +1412,19 @@ if (!is_array($MESSAGE) || !is_array($MESSAGE['parts']) || !($_GET['_uid'] && $_GET['_part']) || !$MESSAGE['parts'][$_GET['_part']]) return ''; - $part = $MESSAGE['parts'][$_GET['_part']]; + $part = &$MESSAGE['parts'][$_GET['_part']]; $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'cellspacing', 'cellpadding', 'border', 'summary')); $out = '<table '. $attrib_str . ">\n"; $filename = $part->d_parameters['filename'] ? $part->d_parameters['filename'] : $part->ctype_parameters['name']; - $filesize = strlen($IMAP->mime_decode($part->body, $part->headers['content-transfer-encoding'])); + $filesize = $part->size; if ($filename) { $out .= sprintf('<tr><td class="title">%s</td><td>%s</td><td>[<a href="./?%s">%s</a>]</tr>'."\n", rcube_label('filename'), - rep_specialchars_output($filename), + rep_specialchars_output(rcube_imap::decode_mime_string($filename)), str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']), rcube_label('download')); } @@ -1323,31 +1451,9 @@ $attrib['src'] = './?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']); $attrib_str = create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height')); - $out = '<iframe '. $attrib_str . "></ifame>"; + $out = '<iframe '. $attrib_str . "></iframe>"; return $out; - } - - -// create temp dir for attachments -function rcmail_create_compose_tempdir() - { - global $CONFIG; - - if ($_SESSION['compose']['temp_dir']) - return $_SESSION['compose']['temp_dir']; - - if (!empty($CONFIG['temp_dir'])) - $temp_dir = $CONFIG['temp_dir'].(!eregi('\/$', $CONFIG['temp_dir']) ? '/' : '').$_SESSION['compose']['id']; - - // create temp-dir for uploaded attachments - if (!empty($CONFIG['temp_dir']) && is_writeable($CONFIG['temp_dir'])) - { - mkdir($temp_dir); - $_SESSION['compose']['temp_dir'] = $temp_dir; - } - - return $_SESSION['compose']['temp_dir']; } @@ -1356,18 +1462,14 @@ { if (!isset($_SESSION['compose'])) return; - + // remove attachment files from temp dir if (is_array($_SESSION['compose']['attachments'])) foreach ($_SESSION['compose']['attachments'] as $attachment) - unlink($attachment['path']); - - // kill temp dir - if ($_SESSION['compose']['temp_dir']) - rmdir($_SESSION['compose']['temp_dir']); + @unlink($attachment['path']); unset($_SESSION['compose']); } -?> \ No newline at end of file +?> -- Gitblit v1.9.1