- Use user's timezone in Date header, not server's timezone (#1486119)

release-0.6
alecpl 15 years ago
parent 0133e6b7aa
commit 2bf3cc6fc3

@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
- Use user's timezone in Date header, not server's timezone (#1486119)
- Add option to set separate footer for HTML messages (#1486660)
- Add real SMTP error description to displayed error messages (#1485927)
- Fix some IMAP errors handling when opening the message (#1485443)

@ -1478,7 +1478,7 @@ function rcmail_send_mdn($uid, &$smtp_error)
// compose headers array
$headers = array(
'Date' => date('r'),
'Date' => rcmail_user_date(),
'From' => $sender,
'To' => $message->headers->mdn_to,
'Subject' => rcube_label('receiptread') . ': ' . $message->subject,
@ -1523,6 +1523,30 @@ function rcmail_send_mdn($uid, &$smtp_error)
return false;
}
// Returns RFC2822 formatted current date in user's timezone
function rcmail_user_date()
{
global $CONFIG;
// get user's timezone
if ($CONFIG['timezone'] === 'auto') {
console($_SESSION['timezone']);
$tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
}
else {
$tz = $CONFIG['timezone'];
if ($CONFIG['dst_active'])
$tz++;
}
$date = time() + $tz * 60 * 60;
$date = gmdate('r', $date);
$date = preg_replace('/[+-][0-9]{4}$/', sprintf('%+05d', $tz * 100), $date);
return $date;
}
function rcmail_search_filter($attrib)
{
global $OUTPUT, $CONFIG;

@ -287,7 +287,7 @@ if ($CONFIG['http_received_header'])
$headers['Received'] = $http_header;
}
$headers['Date'] = date('r');
$headers['Date'] = rcmail_user_date();
$headers['From'] = rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset);
$headers['To'] = $mailto;

Loading…
Cancel
Save