[FIX] PHP 8.1 Deprecated: Function strftime() is deprecated

Author: Seiger

core/src/Core.php

@@ -3534,17 +3534,13 @@ public function updateValidatedUserSession()
         if ($userId != false) {
             Models\ActiveUserSession::where('internalKey', $userId)->delete();
             Models\ActiveUserSession::where('sid', $this->sid)->delete();
-            try {
-                Models\ActiveUserSession::updateOrCreate([
-                    'internalKey' => $userId,
-                    'sid' => $this->sid,
-                ], [
-                    'lasthit' => $this->time,
-                    'ip' => $_SESSION['ip'],
-                ]);
-            } catch (\Exception $exception) {
-                
-            }
+            Models\ActiveUserSession::updateOrCreate([
+                'internalKey' => $userId,
+                'sid' => $this->sid,
+            ], [
+                'lasthit' => $this->time,
+                'ip' => $_SESSION['ip'],
+            ]);
         }
     }
 
@@ -4658,7 +4654,7 @@ public function toDateFormat($timestamp = 0, $mode = '')
                 );
                 $strTime = $formatter->format($timestamp);
             } elseif ($mode === 'formatOnly') {
-                $strTime = $dateFormat;
+                $strTime = $this->getConfig('datetime_format');
             }
         } else {
             if (empty($mode)) {

core/src/Legacy/Modifiers.php

@@ -3,6 +3,7 @@
 use EvolutionCMS\Interfaces\ModifiersInterface;
 use EvolutionCMS\Models\SiteTemplate;
 use EvolutionCMS\Support\DataGrid;
+use IntlDateFormatter;
 
 class Modifiers implements ModifiersInterface
 {
@@ -851,7 +852,21 @@ public function getValueFromPreset($key, $value, $cmd, $opt)
                 if (strpos($opt, '%') !== false) {
                     return strftime($opt, 0 + $value);
                 } else {
-                    return date($opt, 0 + $value);
+                    if (extension_loaded('intl')) {
+                        // https://www.php.net/manual/en/class.intldateformatter.php
+                        // https://www.php.net/manual/en/datetime.createfromformat.php
+                        $formatter = new IntlDateFormatter(
+                            evolutionCMS()->getConfig('manager_language'),
+                            IntlDateFormatter::MEDIUM,
+                            IntlDateFormatter::MEDIUM,
+                            null,
+                            null,
+                            $opt
+                        );
+                        return $formatter->format(0 + $value);
+                    } else {
+                        return date($opt, 0 + $value);
+                    }
                 }
             case 'time':
                 if (empty($opt)) {

manager/views/page/2.blade.php

@@ -133,7 +133,21 @@
         $html = '<p>[%no_active_users_found%]</p>';
     } else {
         $now = $modx->timestamp($_SERVER['REQUEST_TIME']);
-        $ph['now'] = strftime('%H:%M:%S', $now);
+        if (extension_loaded('intl')) {
+            // https://www.php.net/manual/en/class.intldateformatter.php
+            // https://www.php.net/manual/en/datetime.createfromformat.php
+            $formatter = new IntlDateFormatter(
+                evolutionCMS()->getConfig('manager_language'),
+                IntlDateFormatter::MEDIUM,
+                IntlDateFormatter::MEDIUM,
+                null,
+                null,
+                "hh:mm:ss"
+            );
+            $ph['now'] = $formatter->format($now);
+        } else {
+            $ph['now'] = strftime('%H:%M:%S', $now);
+        }
         $timetocheck = ($now - (60 * 20)); //+$server_offset_time;
         $html = '
 	<div class="card-body">
@@ -163,14 +177,29 @@
             $webicon = $activeUser['internalKey'] < 0 ? '<i class="[&icon_globe&]"></i>' : '';
             $ip = $activeUser['ip'] === '::1' ? '127.0.0.1' : $activeUser['ip'];
             $currentaction = EvolutionCMS\Legacy\LogHandler::getAction($activeUser['action'], $activeUser['id']);
+            if (extension_loaded('intl')) {
+                // https://www.php.net/manual/en/class.intldateformatter.php
+                // https://www.php.net/manual/en/datetime.createfromformat.php
+                $formatter = new IntlDateFormatter(
+                    evolutionCMS()->getConfig('manager_language'),
+                    IntlDateFormatter::MEDIUM,
+                    IntlDateFormatter::MEDIUM,
+                    null,
+                    null,
+                    "hh:mm:ss"
+                );
+                $lasthit = $formatter->format($modx->timestamp($activeUser['lasthit']));
+            } else {
+                $lasthit = strftime('%H:%M:%S', $modx->timestamp($activeUser['lasthit']));
+            }
             $userList[] = array(
                 $idle,
                 '',
                 $activeUser['username'],
                 $webicon,
                 abs($activeUser['internalKey']),
                 $ip,
-                strftime('%H:%M:%S', $modx->timestamp($activeUser['lasthit'])),
+                $lasthit,
                 $currentaction
             );
         }
@@ -280,7 +309,7 @@
         'title' => '[%welcome_title%]',
         'body' => '
             <div class="wm_buttons card-body">' .
-                ($modx->hasPermission("new_document") ? '
+            ($modx->hasPermission("new_document") ? '
                 <span class="wm_button">
                     <a target="main" href="index.php?a=4">
                         <i class="'. $_style['icon_document'] . $_style['icon_size_2x'] . $_style['icon_size_fix'] . '"></i>
@@ -294,31 +323,31 @@
                     </a>
                 </span>
                 ' : '') .
-                ($modx->hasPermission("assets_images") ? '
+            ($modx->hasPermission("assets_images") ? '
                 <span class="wm_button">
                     <a target="main" href="media/browser/mcpuk/browse.php?filemanager=media/browser/mcpuk/browse.php&type=images">
                         <i class="'. $_style['icon_camera'] . $_style['icon_size_2x'] . $_style['icon_size_fix'] . '"></i>
                         <span>[%images_management%]</span>
                     </a>
                 </span>
                 ' : '') .
-                ($modx->hasPermission("assets_files") ? '
+            ($modx->hasPermission("assets_files") ? '
                 <span class="wm_button">
                     <a target="main" href="media/browser/mcpuk/browse.php?filemanager=media/browser/mcpuk/browse.php&type=files">
                         <i class="'. $_style['icon_files'] . $_style['icon_size_2x'] . $_style['icon_size_fix'] . '"></i>
                         <span>[%files_management%]</span>
                     </a>
                 </span>
                 ' : '') .
-                ($modx->hasPermission("bk_manager") ? '
+            ($modx->hasPermission("bk_manager") ? '
                 <span class="wm_button">
                     <a target="main" href="index.php?a=93">
                         <i class="'. $_style['icon_database'] . $_style['icon_size_2x'] . $_style['icon_size_fix'] . '"></i>
                         <span>[%bk_manager%]</span>
                     </a>
                 </span>
                 ' : '') .
-                ($modx->hasPermission("change_password") ? '
+            ($modx->hasPermission("change_password") ? '
                 <span class="wm_button">
                     <a target="main" href="index.php?a=28">
                         <i class="'. $_style['icon_lock'] . $_style['icon_size_2x'] . $_style['icon_size_fix'] . '"></i>
@@ -351,7 +380,7 @@
                         <td>[%yourinfo_total_logins%]</td>
                         <td><b>[[$_SESSION[\'mgrLogincount\']:math(\'%s+1\')]]</b></td>
                     </tr>' .
-                    ($modx->hasPermission("change_password") ? '
+            ($modx->hasPermission("change_password") ? '
 
                     ' : '') . '
                 </table>