Changeset 893 for trunk/Modules/Log

Timestamp:

Mar 6, 2023, 1:48:45 AM (21 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

• trunk/Modules/Log/Log.php (modified) (8 diffs)

trunk/Modules/Log/Log.php

@@ -33 +33 @@
   function WriteLog($Text, $Type)
   {
-    if (isset($this->System->User) and !is_null($this->System->User->Id))
-      $UserId = $this->System->User->Id;
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if (isset($User) and !is_null($User->Id))
+      $UserId = $User->Id;
       else $UserId = 'NULL';
     $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
@@ -40 +41 @@
       GetRemoteAddress().'", "'.GetRequestURI().'")';
     $this->System->Database->query($Query);
+  }
+
+  static function Cast(Module $Module): ModuleLog
+  {
+    if ($Module instanceof ModuleLog)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected '.ModuleLog::GetClassName().' type but got '.gettype($Module));
   }
 }
@@ -91 +101 @@
       (
         'Title' => $LogType['Name'].' ('.$Line['UserName'].', '.$Line['IP'].')',
-        'Link' => 'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/log/'),
+        'Link' => 'https://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/log/'),
         'Description' => $LogType['Name'].': '.$Line['Text'].' ('.$Line['UserName'].
           ', '.$Line['IP'].', '.HumanDate($Line['Date']).')',
@@ -100 +110 @@
     $Output .= GenerateRSS(array
     (
-      'Title' => $this->System->Config['Web']['Title'].' - '.T('Logs'),
-      'Link' => 'https://'.$this->System->Config['Web']['Host'].$this->System->Link('/'),
-      'Description' => $this->System->Config['Web']['Description'],
-      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
+      'Title' => Core::Cast($this->System)->Config['Web']['Title'].' - '.T('Logs'),
+      'Link' => 'https://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/'),
+      'Description' => Core::Cast($this->System)->Config['Web']['Description'],
+      'WebmasterEmail' => Core::Cast($this->System)->Config['Web']['AdminEmail'],
       'Items' => $Items,
     ));
@@ -121 +131 @@
   function ShowList()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
@@ -141 +152 @@
 
     // Show category filter
-    if ($this->System->User->Licence(LICENCE_MODERATOR))
+    if ($User->Licence(LICENCE_MODERATOR))
     {
       $Output = '<strong>'.T('Filter').':</strong>';
@@ -203 +214 @@
     $Output .= '</table>'.
       $PageList['Output'];
-      if ($this->System->User->Licence(LICENCE_ADMIN))
+      if ($User->Licence(LICENCE_ADMIN))
       {
         $Output .= '<div>'.T('Remove').': <a href="'.$this->System->Link('/log/?a=delerrlog&amp;type='.LOG_TYPE_ERROR).'">'.T('Error logs').'</a> '.
@@ -215 +226 @@
   function DeleteErrorLog()
   {
-    if ($this->System->User->Licence(LICENCE_ADMIN) and
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_ADMIN) and
     (($_GET['type'] == LOG_TYPE_ERROR) or ($_GET['type'] == LOG_TYPE_PAGE_NOT_FOUND)))
     {