From 7902df457d3401c83f78a6ddd48df1a7f07f68b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 20 Oct 2005 18:20:26 -0400
Subject: [PATCH] Fixed SSL support; improved Courier compatibility; some visual enhancements and bugfixes
---
program/steps/mail/func.inc | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index c0b303a..98e0cdb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -198,11 +198,15 @@
$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'],
@@ -303,13 +307,13 @@
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 @@
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;
}
--
Gitblit v1.9.1