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 | 100 ++++++++++++++++---------------------------------
1 files changed, 33 insertions(+), 67 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6ffde1c..98e0cdb 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -99,63 +99,14 @@
// var_dump($a_mailboxes);
if ($type=='select')
- $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox);
+ $out .= rcmail_render_folder_tree_select($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
else
- $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox);
+ $out .= rcmail_render_folder_tree_html($a_mailboxes, $special_mailboxes, $mbox, $attrib['maxlength']);
-
-/*
- foreach ($a_folders as $i => $folder)
- {
- $zebra_class = $i%2 ? 'even' : 'odd';
- $folder_prop = $a_subfolders[$folder];
- $foldername = isset($folder_prop) ? $folder_prop['name'] : $folder;
-
- $folder_lc = strtolower($foldername);
- if (in_array($folder_lc, $special_mailboxes))
- $foldername = rcube_label($folder_lc);
-
- if ($unread_count = $IMAP->messagecount($folder, 'UNSEEN'))
- $foldername .= sprintf(' (%d)', $unread_count);
-
- $indent = isset($folder_prop) ? sprintf(' indent%d', $folder_prop['level']) : '';
- $indent_str = isset($folder_prop) ? str_repeat(' ', (int)$folder_prop['level']) : '';
-
- // compose mailbox line
- if ($type=='select')
- $out .= sprintf('<option value="%s">%s%s</option>'."\n",
- $folder,
- $indent_str,
- rep_specialchars_output($foldername));
-
- else
- $out .= sprintf('<li class="mailbox %s %s%s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a></li>'."\n",
- preg_replace('/[^a-z0-9\-_]/', '', strtolower($folder)),
- $zebra_class,
- $unread_count ? ' unread' : '',
- $folder==$mbox ? ' selected' : '',
- $indent,
- $folder,
- $JS_OBJECT_NAME,
- $folder,
- $JS_OBJECT_NAME,
- $folder,
- rep_specialchars_output($foldername));
- }
-*/
if ($type=='ul')
$OUTPUT->add_script(sprintf("%s.gui_object('mailboxlist', '%s');", $JS_OBJECT_NAME, $attrib['id']));
-
-/* this is added further up
- if (!$s_added_script)
- {
- $javascript .= sprintf("%s.set_env('mailbox', '%s');", $JS_OBJECT_NAME, $mbox);
- $OUTPUT->add_script($javascript);
- $s_added_script = TRUE;
- }
-*/
return $out . "</$type>";
}
@@ -192,7 +143,7 @@
// return html for a structured list <ul> for the mailbox tree
-function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $nestLevel = 0)
+function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
global $JS_OBJECT_NAME, $IMAP;
@@ -208,7 +159,11 @@
else
$foldername = $folder['name'];
- if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN'))
+ // shorten the folder name to a given length
+ if ($maxlength && $maxlength>1)
+ $foldername = abbrevate_string($foldername, $maxlength);
+
+ if ($unread_count = $IMAP->messagecount($folder['id'], 'UNSEEN', ($folder['id']==$mbox)))
$foldername .= sprintf(' (%d)', $unread_count);
$out .= sprintf('<li class="mailbox %s %s%s%s"><a href="#%s" onclick="return %s.command(\'list\',\'%s\')" onmouseup="return %s.mbox_mouse_up(\'%s\')">%s</a>'."\n",
@@ -224,7 +179,7 @@
rep_specialchars_output($foldername));
if (!empty($folder['folders']))
- $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $nestLevel+1) . "</ul>\n";
+ $out .= '<ul>' . rcmail_render_folder_tree_html($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1) . "</ul>\n";
$out .= "</li>\n";
$idx++;
@@ -235,7 +190,7 @@
// return html for a flat list <select> for the mailbox tree
-function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $nestLevel=0)
+function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
global $IMAP;
@@ -243,13 +198,23 @@
$out = '';
foreach ($arrFolders as $key=>$folder)
{
+ $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),
- rep_specialchars_output($folder['name']));
+ rep_specialchars_output($foldername));
if (!empty($folder['folders']))
- $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $nestLevel+1);
+ $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox, $maxlength, $nestLevel+1);
$idx++;
}
@@ -290,7 +255,7 @@
$out .= "<thead><tr>\n<td class=\"icon\"> </td>\n";
foreach ($a_show_cols as $col)
- $out .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+ $out .= '<td class="'.$col.'">' . rep_specialchars_output(rcube_label($col)) . "</td>\n";
$out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
$out .= "</tr></thead>\n<tbody>\n";
@@ -299,9 +264,10 @@
// no messages in this mailbox
if (!sizeof($a_headers))
{
- $out .= sprintf('<tr><td colspan="%d">%s</td></tr>',
+ $out .= rep_specialchars_output(
+ sprintf('<tr><td colspan="%d">%s</td></tr>',
sizeof($a_show_cols)+2,
- rcube_label('nomessagesfound'));
+ rcube_label('nomessagesfound')));
}
@@ -341,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";
}
@@ -415,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;
}
@@ -485,7 +451,7 @@
'to' => min($max, $start_msg + $IMAP->page_size - 1),
'count' => $max)));
- return $out;
+ return rep_specialchars_output($out);
}
@@ -549,7 +515,7 @@
// 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";
@@ -851,7 +817,7 @@
$header_value = rep_specialchars_output($IMAP->decode_header($headers[$hkey]), '', 'all');
$out .= "\n<tr>\n";
- $out .= '<td class="header-title">'.rcube_label($hkey).": </td>\n";
+ $out .= '<td class="header-title">'.rep_specialchars_output(rcube_label($hkey)).": </td>\n";
$out .= '<td class="'.$hkey.'" width="90%">'.$header_value."</td>\n</tr>";
$header_count++;
}
--
Gitblit v1.9.1