From 5b1de5598164c136567c29149c117aa8a4198f1b Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 21 Jul 2008 06:26:24 -0400
Subject: [PATCH] - use long date format in print mode (#1485191)
---
CHANGELOG | 4 ++++
program/include/main.inc | 2 ++
program/steps/mail/func.inc | 11 ++++++++---
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index ac2702b..f7585c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,10 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/07/21 (alec)
+----------
+- use long date format in print mode (#1485191)
+
2008/07/18 (alec)
----------
- Updated TinyMCE to version 3.1.0.1
diff --git a/program/include/main.inc b/program/include/main.inc
index d75921f..65b322f 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -754,6 +754,8 @@
// month name (long)
else if ($format{$i}=='F')
$out .= rcube_label('long'.strtolower(date('M', $timestamp)));
+ else if ($format{$i}=='x')
+ $out .= strftime('%x %X', $timestamp);
else
$out .= date($format{$i}, $timestamp);
}
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6ba3d16..58c9c8b 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -658,7 +658,7 @@
*/
function rcmail_message_headers($attrib, $headers=NULL)
{
- global $IMAP, $OUTPUT, $MESSAGE;
+ global $IMAP, $OUTPUT, $MESSAGE, $PRINT_MODE, $CONFIG;
static $sa_attrib;
// keep header table attrib
@@ -678,7 +678,7 @@
// add empty subject if none exsists
if (empty($headers['subject']))
$headers['subject'] = rcube_label('nosubject');
-
+
$header_count = 0;
// allow the following attributes to be added to the <table> tag
@@ -694,7 +694,12 @@
continue;
if ($hkey=='date' && !empty($headers[$hkey]))
- $header_value = format_date($headers[$hkey]);
+ {
+ if ($PRINT_MODE)
+ $header_value = format_date($headers[$hkey], $CONFIG['date_long'] ? $CONFIG['date_long'] : 'x');
+ else
+ $header_value = format_date($headers[$hkey]);
+ }
else if (in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to')))
$header_value = Q(rcmail_address_string($headers[$hkey], NULL, $attrib['addicon']), 'show');
else
--
Gitblit v1.9.1