diff options
| author | alecpl <alec@alec.pl> | 2008-07-21 10:26:24 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-07-21 10:26:24 +0000 |
| commit | 5b1de5598164c136567c29149c117aa8a4198f1b (patch) | |
| tree | de6dbce149dd460e82d7332fe91cadb6fdb02dfe | |
| parent | bd6c082bbc09f90c51b5acffa4a913c134787185 (diff) | |
- use long date format in print mode (#1485191)
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/include/main.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 11 |
3 files changed, 14 insertions, 3 deletions
@@ -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 d75921f3a..65b322f8e 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -754,6 +754,8 @@ function format_date($date, $format=NULL) // 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 6ba3d1664..58c9c8bd7 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -658,7 +658,7 @@ function rcmail_str_replacement($str, &$rep) */ 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 @@ function rcmail_message_headers($attrib, $headers=NULL) // 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 @@ function rcmail_message_headers($attrib, $headers=NULL) 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 |