diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/main.inc | 16 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 4 |
2 files changed, 15 insertions, 5 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 09a53f0ad..b5004e899 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1507,12 +1507,22 @@ function format_date($date, $format=NULL) global $CONFIG, $sess_user_lang; $ts = NULL; - + if (is_numeric($date)) $ts = $date; else if (!empty($date)) - $ts = @strtotime($date); - + { + while (($ts = @strtotime($date))===false) + { + // if we have a date in non-rfc format + // remove token from the end and try again + $d = explode(' ', $date); + array_pop($d); + if (!$d) break; + $date = implode(' ', $d); + } + } + if (empty($ts)) return ''; diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index b75b1150c..40c17b792 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -970,7 +970,7 @@ function rcmail_message_headers($attrib, $headers=NULL) continue; if ($hkey=='date' && !empty($headers[$hkey])) - $header_value = format_date(strtotime($headers[$hkey])); + $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 @@ -1500,7 +1500,7 @@ function rcmail_send_mdn($uid) $body = rcube_label("yourmessage") . "\r\n\r\n" . "\t" . rcube_label("to") . ': ' . rcube_imap::decode_mime_string($message['headers']->to, $message['headers']->charset) . "\r\n" . "\t" . rcube_label("subject") . ': ' . $message['subject'] . "\r\n" . - "\t" . rcube_label("sent") . ': ' . format_date(strtotime($message['headers']->date), $CONFIG['date_long']) . "\r\n" . + "\t" . rcube_label("sent") . ': ' . format_date($message['headers']->date, $CONFIG['date_long']) . "\r\n" . "\r\n" . rcube_label("receiptnote") . "\r\n"; $ua = !empty($CONFIG['useragent']) ? $CONFIG['useragent'] : "RoundCube Webmail (Version ".RCMAIL_VERSION.")"; |