Changeset 6 for trunk/Modules/User/UserModel.php

Timestamp:

Apr 14, 2020, 11:06:28 PM (5 years ago)

Author:

chronos

Message:

• Modified: Check existence of Log module.

File:

• trunk/Modules/User/UserModel.php (modified) (6 diffs)

trunk/Modules/User/UserModel.php

@@ -119 +119 @@
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
+      if(($DbRow['User'] != null) and $this->System->ModuleManager->ModulePresent('Log'))
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -174 +175 @@
 
             $Result = USER_REGISTRATED;
-            if(array_key_exists('Log', $this->System->ModuleManager->Modules))
+            if($this->System->ModuleManager->ModulePresent('Log'))
               $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'NewRegistration', $Login);
           }
@@ -194 +195 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
         $Output = USER_REGISTRATION_CONFIRMED;
-        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
-          $Row['Login'].', Id='.$Row['Id']);
+        if($this->System->ModuleManager->ModulePresent('Log'))
+          $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'Login='.
+            $Row['Login'].', Id='.$Row['Id']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
@@ -242 +244 @@
     $SID = session_id();
     $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => null));
-    if(array_key_exists('Log', $this->System->ModuleManager->Modules))
+    if($this->System->ModuleManager->ModulePresent('Log'))
       $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
@@ -397 +399 @@
 
       $Output = USER_PASSWORD_RECOVERY_SUCCESS;
-      $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
+      if($this->System->ModuleManager->ModulePresent('Log'))
+        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
     return($Output);
@@ -415 +418 @@
         $this->Database->update('User', 'Id='.$Row['Id'], array('Password' => $PasswordHash->Hash($NewPassword, $Salt),
           'Salt' => $Salt, 'Locked' => 0));
-        $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
-        $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
+        if($this->System->ModuleManager->ModulePresent('Log'))
+          $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'Login='.$Row['Login']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;