Store time/date as unix timestamp

Author: Cyperghost

wcfsetup/install/files/lib/system/condition/provider/UserConditionProvider.class.php

@@ -20,7 +20,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @extends AbstractConditionProvider<IDatabaseObjectListConditionType<UserList>&IObjectConditionType<User>>
+ * @extends AbstractConditionProvider<IDatabaseObjectListConditionType<UserList, mixed>&IObjectConditionType<User, mixed>>
  */
 final class UserConditionProvider extends AbstractConditionProvider
 {

wcfsetup/install/files/lib/system/condition/type/user/UserRegistrationDateConditionType.class.php

@@ -17,7 +17,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  *
- * @phpstan-type Filter = array{condition: string, value: string}
+ * @phpstan-type Filter = array{condition: string, value: int}
  * @implements IDatabaseObjectListConditionType<UserList<User>, Filter>
  * @implements IObjectConditionType<User, Filter>
  * @extends AbstractConditionType<Filter>
@@ -48,7 +48,7 @@ public function getLabel(): string
     #[\Override]
     public function applyFilter(DatabaseObjectList $objectList): void
     {
-        ["condition" => $condition, "time" => $time] = $this->getParsedFilter();
+        ["condition" => $condition, "value" => $time] = $this->filter;
 
         $objectList->getConditionBuilder()->add(
             "{$objectList->getDatabaseTableAlias()}.registrationDate {$condition} ?",
@@ -59,7 +59,7 @@ public function applyFilter(DatabaseObjectList $objectList): void
     #[\Override]
     public function match(object $object): bool
     {
-        ["condition" => $condition, "time" => $time] = $this->getParsedFilter();
+        ["condition" => $condition, "value" => $time] = $this->filter;
 
         return match ($condition) {
             ">" => $object->registrationDate > $time,
@@ -70,23 +70,6 @@ public function match(object $object): bool
         };
     }
 
-    /**
-     * @return array{condition: string, time: int}
-     */
-    private function getParsedFilter(): array
-    {
-        $dateTime = \DateTime::createFromFormat(
-            DateConditionFormField::TIME_FORMAT,
-            $this->filter["value"],
-            new \DateTimeZone(TIMEZONE),
-        );
-
-        return [
-            'condition' => $this->filter["condition"],
-            'time' => $dateTime->getTimestamp(),
-        ];
-    }
-
     /**
      * @return string[]
      */

wcfsetup/install/files/lib/system/form/builder/field/DateConditionFormField.class.php

@@ -3,6 +3,8 @@
 namespace wcf\system\form\builder\field;
 
 use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\WCF;
+use wcf\util\DateUtil;
 
 /**
  * @author Olaf Braun
@@ -23,7 +25,7 @@ final class DateConditionFormField extends AbstractConditionFormField implements
 
     public const DATE_FORMAT = 'Y-m-d';
 
-    public const TIME_FORMAT = 'Y-m-d\TH:i:sP';
+    public const TIME_FORMAT = 'Y-m-d\TH:i:s';
 
     /**
      * is `true` if not only the date, but also the time can be set
@@ -35,6 +37,30 @@ final class DateConditionFormField extends AbstractConditionFormField implements
      */
     protected $templateName = 'shared_dateConditionFormField';
 
+    public function __construct()
+    {
+        $this->fieldAttribute("data-ignore-timezone", "1");
+    }
+
+    #[\Override]
+    public function getSaveValue()
+    {
+        if ($this->getValue() === null) {
+            return parent::getSaveValue();
+        }
+
+        $dateTime = \DateTime::createFromFormat(
+            $this->supportsTime() ? self::TIME_FORMAT : self::DATE_FORMAT,
+            $this->getValue(),
+            WCF::getUser()->getTimezone()
+        );
+
+        return [
+            "condition" => $this->getCondition(),
+            "value" => $dateTime->getTimestamp(),
+        ];
+    }
+
     #[\Override]
     public function validate()
     {
@@ -44,7 +70,7 @@ public function validate()
             $dateTime = \DateTime::createFromFormat(
                 $this->supportsTime() ? self::TIME_FORMAT : self::DATE_FORMAT,
                 $this->getValue(),
-                new \DateTimeZone(TIMEZONE)
+                WCF::getUser()->getTimezone()
             );
 
             if ($dateTime === false) {
@@ -58,6 +84,20 @@ public function validate()
         }
     }
 
+    #[\Override]
+    public function value($value): self
+    {
+        parent::value($value);
+
+        if ($this->getValue() !== null) {
+            $dateTime = DateUtil::getDateTimeByTimestamp($this->getValue());
+            $dateTime->setTimezone(WCF::getUser()->getTimezone());
+            $this->value["value"] = $dateTime->format($this->supportsTime() ? self::TIME_FORMAT : self::DATE_FORMAT);
+        }
+
+        return $this;
+    }
+
     /**
      * Sets if not only the date, but also the time can be set.
      */