Zipdownload: Fix message date time zone in mbox export (#10147)

Also fix anytodatetime() so it does not change the timezone of the returned object.

Author: alecpl

CHANGELOG.md

@@ -10,6 +10,7 @@ This file includes only changes we consider noteworthy for users, admins and plu
 - Stricter recognition of an Ajax request (#10118)
 - Allow cidr (subnets) in proxy_whitelist (#7103)
 - Password: Added Stalwart driver (#10114)
+- Zipdownload: Fix message date time zone in mbox export (#10147)
 - Fix regression where some data url images could get ignored/lost (#10128)
 - Fix SVG Animate FUNCIRI Attribute Bypass — Remote Image Loading via fill/filter/stroke [CVE-2026-35545]
 

plugins/zipdownload/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "Adds an option to download all attachments to a message in one zip file, when a message has multiple attachments. Also allows the download of a selection of messages in one zip file. Supports mbox and maildir format.",
     "license": "GPL-3.0-or-later",
-    "version": "3.5",
+    "version": "3.6",
     "authors": [
         {
             "name": "Thomas Bruederli",

plugins/zipdownload/zipdownload.php

@@ -258,16 +258,15 @@ private function _download_messages($messageset)
                     $from = preg_replace('/\s/', '-', $from);
 
                     // Received (internal) date
-                    $date = rcube_utils::anytodatetime($headers->internaldate, $timezone);
+                    $date = rcube_utils::anytodatetime($headers->internaldate);
                     if ($date) {
-                        $date = $date->format(self::MBOX_DATE_FORMAT);
+                        $date = $date->setTimezone($timezone)->format(self::MBOX_DATE_FORMAT);
+                    } else {
+                        $date = new \DateTime('now', $timezone);
                     }
 
                     // Mbox format header (RFC4155)
-                    $header = sprintf("From %s %s\r\n",
-                        $from ?: 'MAILER-DAEMON',
-                        $date ?: ''
-                    );
+                    $header = sprintf("From %s %s\r\n", $from ?: 'MAILER-DAEMON', $date);
 
                     $messages[$uid . ':' . $mbox] = $header;
                 } else { // maildir

program/lib/Roundcube/rcube_utils.php

@@ -1176,7 +1176,7 @@ public static function strtotime($date, $timezone = null)
      * Date parsing function that turns the given value into a DateTime object
      *
      * @param \DateTime|string $date     A date
-     * @param \DateTimeZone    $timezone Timezone to use for DateTime object
+     * @param \DateTimeZone    $timezone A timezone to use for the result, if not included in the input
      *
      * @return \DateTime|false DateTime object or False on failure
      */
@@ -1202,10 +1202,7 @@ public static function anytodatetime($date, $timezone = null)
         // try our advanced strtotime() method
         if (!$dt && ($timestamp = self::strtotime($date, $timezone))) {
             try {
-                $dt = new \DateTime('@' . $timestamp);
-                if ($timezone) {
-                    $dt->setTimezone($timezone);
-                }
+                $dt = $timezone ? new \DateTime('@' . $timestamp, $timezone) : new \DateTime('@' . $timestamp);
             } catch (\Exception $e) {
                 // ignore
             }

tests/Framework/UtilsTest.php

@@ -799,22 +799,21 @@ public function test_anytodatetime()
      */
     public function test_anytodatetime_timezone()
     {
+        date_default_timezone_set('America/New_York');
+
         $tz = new \DateTimeZone('Europe/Helsinki');
         $test = [
-            'Jan 1st 2014 +0800' => '2013-12-31 18:00', // result in target timezone
-            'Jan 1st 14 45:42' => '2014-01-01 00:00', // force fallback to rcube_utils::strtotime()
-            'Jan 1st 2014 UK' => '2014-01-01 00:00',
-            '1520587800' => '2018-03-09 11:30',  // unix timestamp conversion
+            'Jan 1st 2014 +0800' => '2014-01-01 00:00 +08:00',
+            'Jan 1st 14 45:42' => '2013-12-31 22:00 +00:00', // force fallback to rcube_utils::strtotime()
+            'Jan 1st 2014 UK' => '2013-12-31 22:00 +00:00',
+            '2026-05-12 13:14:15.000000 Europe/Warsaw' => '2026-05-12 13:14 Europe/Warsaw',
+            '1520587800' => '2018-03-09 09:30 +00:00', // unix timestamp conversion
             'Invalid date' => false,
         ];
 
-        foreach ($test as $datetime => $ts) {
+        foreach ($test as $datetime => $expected) {
             $result = \rcube_utils::anytodatetime($datetime, $tz);
-            if ($result) {
-                // move to target timezone for comparison
-                $result->setTimezone($tz);
-            }
-            $this->assertSame($ts, $result ? $result->format('Y-m-d H:i') : false, "Error parsing date: {$datetime}");
+            $this->assertSame($expected, $result ? $result->format('Y-m-d H:i e') : false, "Error parsing date: {$datetime}");
         }
     }