[FIX] PHP 8.1 Deprecated: Function strftime() is deprecated in settings and dataGrid

Author: Seiger

core/src/Core.php

@@ -4637,28 +4637,43 @@ public function toDateFormat($timestamp = 0, $mode = '')
         if (extension_loaded('intl')) {
             // https://www.php.net/manual/en/class.intldateformatter.php
             // https://www.php.net/manual/en/datetime.createfromformat.php
+            $dateFormat = str_replace(
+                ['%Y', '%m', '%d', '%I', '%H', '%M', '%S', '%p'],
+                ['Y', 'MM', 'dd', 'h', 'hh', 'mm', 'ss', 'a'],
+                $dateFormat
+            );
             if (empty($mode)) {
                 $formatter = new IntlDateFormatter(
                     $this->getConfig('manager_language'),
-                    IntlDateFormatter::MEDIUM,
-                    IntlDateFormatter::MEDIUM,
+                    IntlDateFormatter::FULL,
+                    IntlDateFormatter::FULL,
                     null,
                     null,
-                    $this->getConfig('datetime_format') . " hh:mm:ss"
+                    $dateFormat . " hh:mm:ss"
                 );
                 $strTime = $formatter->format($timestamp);
             } elseif ($mode === 'dateOnly') {
                 $formatter = new IntlDateFormatter(
                     $this->getConfig('manager_language'),
-                    IntlDateFormatter::MEDIUM,
+                    IntlDateFormatter::FULL,
                     IntlDateFormatter::NONE,
                     null,
                     null,
-                    $this->getConfig('datetime_format')
+                    $dateFormat
+                );
+                $strTime = $formatter->format($timestamp);
+            } elseif ($mode === 'timeOnly') {
+                $formatter = new IntlDateFormatter(
+                    $this->getConfig('manager_language'),
+                    IntlDateFormatter::NONE,
+                    IntlDateFormatter::MEDIUM,
+                    null,
+                    null,
+                    "hh:mm:ss"
                 );
                 $strTime = $formatter->format($timestamp);
             } elseif ($mode === 'formatOnly') {
-                $strTime = $this->getConfig('datetime_format');
+                $strTime = $dateFormat;
             }
         } else {
             if (empty($mode)) {

core/src/Support/DataGrid.php

@@ -2,6 +2,7 @@
 
 use EvolutionCMS\Interfaces\DataGridInterface;
 use Illuminate\Database\Query\Builder;
+use IntlDateFormatter;
 
 #
 # DataGrid Class
@@ -304,7 +305,27 @@ public function formatColumnValue($row, $value, $type, &$align)
                 if (!$type_format) {
                     $type_format = "%A %d, %B %Y";
                 }
-                $value = strftime($type_format, $value);
+                if (extension_loaded('intl')) {
+                    // https://www.php.net/manual/en/class.intldateformatter.php
+                    // https://www.php.net/manual/en/datetime.createfromformat.php
+                    $type_format = str_replace(
+                        ['%Y', '%m', '%d', '%I', '%H', '%M', '%S', '%p'],
+                        ['Y', 'MM', 'dd', 'h', 'hh', 'mm', 'ss', 'a'],
+                        $type_format
+                    );
+
+                    $formatter = new IntlDateFormatter(
+                        evolutionCMS()->getConfig('manager_language'),
+                        IntlDateFormatter::FULL,
+                        IntlDateFormatter::FULL,
+                        null,
+                        null,
+                        $type_format . " hh:mm:ss"
+                    );
+                    $value = $formatter->format($value);
+                } else {
+                    $value = strftime($type_format, $value);
+                }
                 break;
 
             case "boolean":

manager/views/page/eventlog.blade.php

@@ -165,7 +165,7 @@ function menuAction(a)
                         $grd->columns = ManagerTheme::getLexicon('type') . " ," . ManagerTheme::getLexicon('source') . " ," . ManagerTheme::getLexicon('date') . " ," . ManagerTheme::getLexicon('event_id') . " ," . ManagerTheme::getLexicon('sysinfo_userid');
                         $grd->colWidths = "1%,,1%,1%,1%";
                         $grd->colAligns = "center,,,center,center";
-                        $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . ManagerTheme::getLexicon('click_to_context') . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . ManagerTheme::getLexicon('click_to_view_details') . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly') . ' %I:%M %p';
+                        $grd->colTypes = "template:<a class='gridRowIcon' href='javascript:;' onclick='return showContentMenu([+id+],event);' title='" . ManagerTheme::getLexicon('click_to_context') . "'><i class='[+icon+]'></i></a>||template:<a href='index.php?a=115&id=[+id+]' title='" . ManagerTheme::getLexicon('click_to_view_details') . "'>[+source+]</a>||date: " . $modx->toDateFormat(null, 'formatOnly');
                         if ($listmode == '1') {
                             $grd->pageSize = 0;
                         }

manager/views/page/system_settings/general.blade.php

@@ -475,7 +475,7 @@
                 'value' => $settings['server_offset_time'],
                 'options' => $serverTimes,
                 'attributes' => 'onChange="documentDirty=true;" size="1"',
-                'comment' => sprintf(ManagerTheme::getLexicon('serveroffset_message'), strftime('%H:%M:%S', time()), strftime('%H:%M:%S', time() + $settings['server_offset_time']))
+                'comment' => sprintf(ManagerTheme::getLexicon('serveroffset_message'), evolutionCMS()->toDateFormat(time(), 'timeOnly'), evolutionCMS()->toDateFormat(time() + $settings['server_offset_time'], 'timeOnly'))
             ])
 
             <div class="split my-1"></div>