From 43fa235da354c8b53aa69ba745c1d398a758fcaf Mon Sep 17 00:00:00 2001
From: svncommit <devs@roundcube.net>
Date: Wed, 26 Oct 2005 05:42:19 -0400
Subject: [PATCH]
---
program/steps/mail/func.inc | 158 +++++++++++++++++++++++++++-------------------------
1 files changed, 83 insertions(+), 75 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6ffde1c..0875c04 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -21,6 +21,8 @@
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';
@@ -99,63 +101,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 +145,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;
@@ -206,9 +159,16 @@
if (in_array($folder_lc, $special))
$foldername = rcube_label($folder_lc);
else
- $foldername = $folder['name'];
+ {
+ $foldername = UTF7DecodeString($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);
+ }
+
+ // add unread message count display
+ 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",
@@ -221,10 +181,10 @@
$folder['id'],
$JS_OBJECT_NAME,
$folder['id'],
- rep_specialchars_output($foldername));
+ rep_specialchars_output($foldername, 'html', 'all'));
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 +195,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 +203,25 @@
$out = '';
foreach ($arrFolders as $key=>$folder)
{
+ $folder_lc = strtolower($folder['id']);
+ if (in_array($folder_lc, $special))
+ $foldername = rcube_label($folder_lc);
+ else
+ {
+ $foldername = UTF7DecodeString($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, 'html', 'all'));
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++;
}
@@ -266,8 +238,12 @@
$skin_path = $CONFIG['skin_path'];
$image_tag = '<img src="%s%s" alt="%s" border="0" />';
+ // check to see if we have some settings for sorting
+ $sort_col = isset($_SESSION['sort_col']) ? $_SESSION['sort_col'] : 'date';
+ $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : 'DESC';
+
// get message headers
- $a_headers = $IMAP->list_headers();
+ $a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);
// add id to message list table if not specified
if (!strlen($attrib['id']))
@@ -289,8 +265,35 @@
// add table title
$out .= "<thead><tr>\n<td class=\"icon\"> </td>\n";
+ $javascript = '';
foreach ($a_show_cols as $col)
- $out .= '<td class="'.$col.'">' . rcube_label($col) . "</td>\n";
+ {
+ // get column name
+ $col_name = rep_specialchars_output(rcube_label($col));
+
+ // make sort links
+ $sort = '';
+ if ($col != 'size')
+ {
+ // asc link
+ $asc = '_ASC';
+ $sort .= '<a href="#" id="sort_' . $col_name . $asc . '" onclick="return rcmail.command(\'sort\',\''
+ . $col_name . $asc . '\',this)" title="Sort by ' . $col_name . ' ascending">'
+ . '<img src="skins/default/images/buttons/up_arrow.png" width="11" height="11" border="0" alt="" /></a>';
+ // desc link
+ $desc = '_DESC';
+ $sort .= ' <a href="#" id="sort_' . $col_name . $desc . '" onclick="return rcmail.command(\'sort\',\''
+ . $col_name . $desc . '\',this)" title="Sort by ' . $col_name . ' descending">'
+ . '<img src="skins/default/images/buttons/down_arrow.png" width="11" height="11" border="0" alt="" /></a>';
+ }
+
+ // put it all together
+ $out .= '<td class="'.$col.'">' . "$col_name $sort</td>\n";
+
+ // register sort buttons
+ $javascript .= "rcmail.register_button('sort', 'sort_{$col_name}_desc', 'link', 'active', '', '');\n";
+ $javascript .= "rcmail.register_button('sort', 'sort_{$col_name}_asc', 'link', 'active', '', '');\n";
+ }
$out .= '<td class="icon">'.($attrib['attachmenticon'] ? sprintf($image_tag, $skin_path, $attrib['attachmenticon'], '') : '')."</td>\n";
$out .= "</tr></thead>\n<tbody>\n";
@@ -299,9 +302,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 +345,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";
}
@@ -366,7 +370,7 @@
$message_count = $IMAP->messagecount();
// set client env
- $javascript = sprintf("%s.gui_object('messagelist', '%s');\n", $JS_OBJECT_NAME, $attrib['id']);
+ $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);
$javascript .= sprintf("%s.set_env('pagecount', %d);\n", $JS_OBJECT_NAME, ceil($message_count/$IMAP->page_size));
@@ -415,13 +419,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 +489,7 @@
'to' => min($max, $start_msg + $IMAP->page_size - 1),
'count' => $max)));
- return $out;
+ return rep_specialchars_output($out);
}
@@ -549,7 +553,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";
@@ -634,6 +638,7 @@
'body' => $structure->body,
'ctype_primary' => $message_ctype_primary,
'ctype_secondary' => $message_ctype_secondary,
+ 'parameters' => $structure->ctype_parameters,
'encoding' => $structure->headers['content-transfer-encoding']);
}
@@ -727,6 +732,7 @@
'body' => $mail_part->body,
'ctype_primary' => $primary_type,
'ctype_secondary' => $secondary_type,
+ 'parameters' => $mail_part->ctype_parameters,
'encoding' => $mail_part->headers['content-transfer-encoding']);
}
@@ -851,7 +857,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++;
}
@@ -901,7 +907,9 @@
$out .= rcmail_message_headers(sizeof($header_attrib) ? $header_attrib : NULL, $part['headers']);
else if ($part['type']=='content')
{
-// var_dump($part['parameters']);
+ 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);
$body = rcmail_print_body($part, $safe_mode);
$out .= '<div class="message-part">';
@@ -1112,7 +1120,7 @@
{
$j++;
if ($PRINT_MODE)
- $out .= sprintf('%s <%s>', htmlentities($part['name']), $part['mailto']);
+ $out .= sprintf('%s <%s>', rep_specialchars_output($part['name']), $part['mailto']);
else if (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto']))
{
$out .= sprintf('<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
@@ -1120,7 +1128,7 @@
$JS_OBJECT_NAME,
$part['mailto'],
$part['mailto'],
- htmlentities($part['name']));
+ rep_specialchars_output($part['name']));
if ($addicon)
$out .= sprintf(' <a href="#add" onclick="return %s.command(\'add-contact\',\'%s\',this)" title="%s"><img src="%s%s" alt="add" border="0" /></a>',
@@ -1133,7 +1141,7 @@
else
{
if ($part['name'])
- $out .= htmlentities($part['name']);
+ $out .= rep_specialchars_output($part['name']);
if ($part['mailto'])
$out .= (strlen($out) ? ' ' : '') . sprintf('<%s>', $part['mailto']);
}
--
Gitblit v1.9.1