Merge pull request #137 from ihackcode/develop

more timezone conversion
XoopsModules25x · Jul 4, 2020 · baf0804 · baf0804
2 parents 5e9b241 + c317854
commit baf0804
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/class/Form/ItemForm.php b/class/Form/ItemForm.php
@@ -147,9 +147,11 @@ public function createElements($obj)
         if (!\is_object($GLOBALS['xoopsUser'])) {
             $group      = [XOOPS_GROUP_ANONYMOUS];
             $currentUid = 0;
+            $timeoffset = 0;
         } else {
             $group      = $GLOBALS['xoopsUser']->getGroups();
             $currentUid = $GLOBALS['xoopsUser']->uid();
+            $timeoffset = $GLOBALS['xoopsUser']->getVar('timezone_offset');
         }
 
         $this->setExtra('enctype="multipart/form-data"');
@@ -359,7 +361,7 @@ public function createElements($obj)
             }
 
             $dateExpireYesNo     = new \XoopsFormRadioYN('', 'use_expire_yn', $dateexpire_opt);
-            $dateexpire = \strtotime(\formatTimestamp($dateexpire)); //set to user timezone
+            $dateexpire = formatTimestamp($dateexpire, 'U', $timeoffset);
             $dateexpire_datetime = new \XoopsFormDateTime('', 'dateexpire', $size = 15, $dateexpire, true);
             if (0 == $dateexpire_opt) {
                 $dateexpire_datetime->setExtra('disabled="disabled"');