Changeset 3746 in subversion

Timestamp:

Jun 13, 2010 6:15:25 AM (3 years ago)

Author:

alec

Message:

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

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/steps/mail/func.inc (modified) (2 diffs)
• program/steps/mail/sendmail.inc (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1479 +1479 @@
     // compose headers array
     $headers = array(
-      'Date' => date('r'),
+      'Date' => rcmail_user_date(),
       'From' => $sender,
       'To'   => $message->headers->mdn_to,
@@ -1523 +1523 @@
   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)

trunk/roundcubemail/program/steps/mail/sendmail.inc

@@ -288 +288 @@
 }
 
-$headers['Date'] = date('r');
+$headers['Date'] = rcmail_user_date();
 $headers['From'] = rcube_charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset);
 $headers['To'] = $mailto;