From ded2b7e166d4b0acab09c00f22f379fbabba709a Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 05 May 2006 12:53:21 -0400
Subject: [PATCH] Changed login page title regarding product name (Bug #1476413)
---
program/steps/mail/func.inc | 153 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 116 insertions(+), 37 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 8ebd1c5..83c8bd8 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -21,8 +21,6 @@
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';
@@ -40,6 +38,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']))
@@ -68,6 +69,9 @@
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');
// $mboxlist_start = rcube_timer();
@@ -148,7 +152,7 @@
if (!isset($arrFolders[$currentFolder]))
{
$arrFolders[$currentFolder] = array('id' => $path,
- 'name' => $currentFolder,
+ 'name' => rcube_charset_convert($currentFolder, 'UTF-7'),
'folders' => array());
}
@@ -160,7 +164,7 @@
// return html for a structured list <ul> for the mailbox tree
function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
- global $JS_OBJECT_NAME, $IMAP, $CONFIG;
+ global $JS_OBJECT_NAME, $COMM_PATH, $IMAP, $CONFIG, $OUTPUT;
$idx = 0;
$out = '';
@@ -174,7 +178,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)
@@ -189,7 +193,7 @@
// add unread message count display
if ($unread_count = $IMAP->messagecount($folder['id'], 'RECENT', ($folder['id']==$mbox)))
$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);
@@ -203,13 +207,16 @@
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>%s</a>',
+ $out .= sprintf('<li id="rcmbx%s" class="mailbox %s %s%s%s"><a href="%s&_mbox=%s"'.
+ ' onclick="return %s.command(\'list\',\'%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'],
+ $COMM_PATH,
+ urlencode($folder['id']),
$JS_OBJECT_NAME,
$folder['id'],
$JS_OBJECT_NAME,
@@ -231,7 +238,7 @@
// return html for a flat list <select> for the mailbox tree
function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
{
- global $IMAP;
+ global $IMAP, $OUTPUT;
$idx = 0;
$out = '';
@@ -242,7 +249,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)
@@ -294,17 +301,18 @@
$a_sort_cols = array('subject', 'date', 'from', 'to');
// show 'to' instead of from in sent messages
- if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols)))
+ if (strtolower($IMAP->get_mailbox_name())=='sent' && ($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
@@ -365,7 +373,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))
{
@@ -386,13 +393,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'];
@@ -442,6 +452,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);
@@ -451,6 +462,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'])
@@ -477,7 +490,8 @@
$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 (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
+ && !array_search('to', $a_show_cols))
$a_show_cols[$f] = 'to';
// loop through message headers
@@ -504,12 +518,9 @@
$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;
-
- if ($header->deleted)
- $a_msg_flags['deleted'] = 1;
-
$commands .= sprintf("this.add_message_row(%s, %s, %s, %b, %b);\n",
$header->uid,
array2js($a_msg_cols),
@@ -522,6 +533,36 @@
}
+// 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)
{
@@ -530,7 +571,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'));
@@ -543,8 +586,31 @@
}
+function rcmail_quota_display($attrib)
+ {
+ global $IMAP, $OUTPUT, $JS_OBJECT_NAME;
-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_text = $IMAP->get_quota()))
+ $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;
@@ -552,11 +618,14 @@
{
return rcube_label(array('name' => 'messagenrof',
'vars' => array('nr' => $MESSAGE['index']+1,
- 'count' => $IMAP->messagecount())));
+ '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');
@@ -578,9 +647,8 @@
extract($part);
$block = $plain ? '%s' : '%s'; //'<div style="display:block;">%s</div>';
- $body = $IMAP->mime_decode($body, $encoding);
+ $body = $IMAP->mime_decode($body, $encoding);
$body = $IMAP->charset_decode($body, $parameters);
-
// text/html
if ($ctype_secondary=='html')
@@ -802,7 +870,7 @@
}
// 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',
@@ -830,7 +898,7 @@
// 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']),
@@ -854,7 +922,13 @@
'size' => strlen($IMAP->mime_decode($mail_part->body, $mail_part->headers['content-transfer-encoding'])) /*,
'content' => $mail_part->body */);
-
+ else if ($mail_part->headers['content-description'])
+ $a_attachments[] = array('filename' => rcube_imap::decode_mime_string($mail_part->headers['content-description']),
+ '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 */);
}
}
@@ -920,7 +994,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)
{
@@ -929,7 +1003,7 @@
if ($hkey=='date' && !empty($headers[$hkey]))
$header_value = format_date(strtotime($headers[$hkey]));
- else if (in_array($hkey, array('from', 'to', 'cc', 'reply-to')))
+ else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to')))
$header_value = rep_specialchars_output(rcmail_address_string($IMAP->decode_header($headers[$hkey]), NULL, $attrib['addicon']));
else
$header_value = rep_specialchars_output($IMAP->decode_header($headers[$hkey]), '', 'all');
@@ -991,7 +1065,12 @@
// $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">';
- $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";
}
}
--
Gitblit v1.9.1