From fbf77b4493f1b77c99751d8a86365c712ae3fb1b Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Fri, 18 Nov 2005 10:35:15 -0500 Subject: [PATCH] Added Japanese localization --- program/steps/mail/func.inc | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 0419654..ca72f74 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -274,7 +274,8 @@ $attrib_str = create_attrib_string($attrib, array('style', 'class', 'id', 'cellpadding', 'cellspacing', 'border', 'summary')); $out = '<table' . $attrib_str . ">\n"; - + + // 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'); @@ -283,6 +284,15 @@ if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))) $a_show_cols[$f] = 'to'; + // add col definition + $out .= '<colgroup>'; + $out .= '<col class="icon">'; + + foreach ($a_show_cols as $col) + $out .= sprintf('<col class="%s">', $col); + + $out .= '<col class="icon">'; + $out .= "</colgroup>\n"; // add table title $out .= "<thead><tr>\n<td class=\"icon\"> </td>\n"; @@ -783,16 +793,17 @@ } // part is file/attachment - else if ($mail_part->disposition=='attachment' || $mail_part->disposition=='inline' || $mail_part->headers['content-id']) + 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']))) { if ($message_ctype_secondary=='related' && $mail_part->headers['content-id']) - $sa_inline_objects[] = array('filename' => $mail_part->d_parameters['filename'], + $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'])); else if ($mail_part->d_parameters['filename']) - $a_attachments[] = array('filename' => $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, @@ -800,7 +811,7 @@ 'content' => $mail_part->body */); else if ($mail_part->ctype_parameters['name']) - $a_attachments[] = array('filename' => $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, -- Gitblit v1.9.1