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

Timestamp:

Apr 6, 2020, 11:17:40 PM (5 years ago)

Author:

chronos

Message:

• Modified: Improved code format.

File:

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

trunk/Modules/User/UserModel.php

@@ -30 +30 @@
   function Hash($Password, $Salt)
   {
-    return(sha1(sha1($Password).$Salt));
+    return (sha1(sha1($Password).$Salt));
   }
 
   function Verify($Password, $Salt, $StoredHash)
   {
-    return($this->Hash($Password, $Salt) == $StoredHash);
+    return ($this->Hash($Password, $Salt) == $StoredHash);
   }
 
@@ -71 +71 @@
     // Lookup user record
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
-    if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
     {
       // Refresh time of last access
@@ -81 +81 @@
 
     // Logged permanently?
-    if(array_key_exists('LoginHash', $_COOKIE))
+    if (array_key_exists('LoginHash', $_COOKIE))
     {
       $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
         ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_assoc();
-        if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        if (sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
         {
           $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
@@ -99 +99 @@
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
-    if($Row['User'] != '')
+    if ($Row['User'] != '')
     {
       $Query = $this->Database->query('SELECT `User`.*, `UserCustomerRel`.`Customer` AS `Member` FROM `User` '.
@@ -114 +114 @@
     // Remove nonactive users
     $DbResult = $this->Database->select('UserOnline', '`Id`, `User`', '(`ActivityTime` < DATE_SUB(NOW(), INTERVAL '.$this->OnlineStateTimeout.' SECOND)) AND (`StayLogged` = 0)');
-    while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
     {
       $this->Database->delete('UserOnline', 'Id='.$DbRow['Id']);
-      if($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
+      if ($DbRow['User'] != null) $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -127 +127 @@
   function Register($Login, $Password, $Password2, $Email, $Name)
   {
-    if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
-    else if($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
+    if (($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
+    else if ($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
     else
     {
       // Is user registred yet?
       $Query = $this->Database->select('User', '*', 'Login = "'.$Login.'"');
-      if($Query->num_rows > 0) $Result = LOGIN_USED;
+      if ($Query->num_rows > 0) $Result = LOGIN_USED;
       else
       {
         $Query = $this->Database->select('User', '*', 'Name = "'.$Name.'"');
-        if($Query->num_rows > 0) $Result = NAME_USED;
+        if ($Query->num_rows > 0) $Result = NAME_USED;
         else
         {
           $Query = $this->Database->select('User', '*', 'Email = "'.$Email.'"');
-          if($Query->num_rows > 0) $Result = EMAIL_USED;
+          if ($Query->num_rows > 0) $Result = EMAIL_USED;
           else
           {
@@ -177 +177 @@
       }
     }
-    return($Result);
+    return ($Result);
   }
 
@@ -183 +183 @@
   {
     $DbResult = $this->Database->select('User', 'Id, Login, Password', 'Id = '.$Id);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_array();
       $NewPassword = substr(sha1(strtoupper($Row['Login'])), 0, 7);
-      if($Hash == $NewPassword)
+      if ($Hash == $NewPassword)
       {
         $this->Database->update('User', 'Id='.$Row['Id'], array('Locked' => 0));
@@ -195 +195 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return($Output);
+    return ($Output);
   }
 
   function Login($Login, $Password, $StayLogged = false)
   {
-    if($StayLogged) $StayLogged = 1; else $StayLogged = 0;
+    if ($StayLogged) $StayLogged = 1; else $StayLogged = 0;
     $SID = session_id();
     $Query = $this->Database->select('User', '*', 'Login="'.$Login.'"');
-    if($Query->num_rows > 0)
+    if ($Query->num_rows > 0)
     {
       $Row = $Query->fetch_assoc();
       $PasswordHash = new PasswordHash();
-      if(!$PasswordHash->Verify($Password, $Row['Salt'], $Row['Password'])) $Result = BAD_PASSWORD;
-      else if($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
+      if (!$PasswordHash->Verify($Password, $Row['Salt'], $Row['Password'])) $Result = BAD_PASSWORD;
+      else if ($Row['Locked'] == 1) $Result = ACCOUNT_LOCKED;
       else
       {
@@ -217 +217 @@
         $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array(
           'User' => $Row['Id'], 'StayLogged' => $StayLogged, 'StayLoggedHash' => $StayLoggedSalt));
-        if($StayLogged)
+        if ($StayLogged)
         {
           setcookie('LoginUserId', $Row['Id'], time()+365*24*60*60, $this->System->Link('/'));
@@ -231 +231 @@
       }
     } else $Result = USER_NOT_REGISTRED;
-    return($Result);
+    return ($Result);
   }
 
@@ -240 +240 @@
     $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'Logout', $this->User['Login']);
     $this->Check();
-    return(USER_LOGGED_OUT);
+    return (USER_LOGGED_OUT);
   }
 
@@ -247 +247 @@
     $this->Roles = array();
     $DbResult = $this->Database->select('UserRole', '*');
-    while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
       $this->Roles[] = $DbRow;
   }
@@ -255 +255 @@
     $this->User['Permission'] = array();
     $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description` FROM `UserRolePermission` JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` WHERE `UserRolePermission`.`Role` = '.$Role);
-    if($DbResult->num_rows > 0)
-    while($DbRow = $DbResult->fetch_array())
+    if ($DbResult->num_rows > 0)
+    while ($DbRow = $DbResult->fetch_array())
       $this->User['Permission'][$DbRow['Operation']] = $DbRow;
   }
@@ -264 +264 @@
     $Result = array();
     $DbResult = $this->Database->query('SELECT `UserRolePermission`.*, `PermissionOperation`.`Description`, `UserRole`.`Title` FROM `UserRolePermission` LEFT JOIN `PermissionOperation` ON `PermissionOperation`.`Id` = `UserRolePermission`.`Operation` LEFT JOIN `UserRole` ON `UserRole`.`Id` = `UserRolePermission`.`Role`');
-    while($DbRow = $DbResult->fetch_array())
+    while ($DbRow = $DbResult->fetch_array())
     {
       $Value = '';
-      if($DbRow['Read']) $Value .= 'R';
-      if($DbRow['Write']) $Value .= 'W';
+      if ($DbRow['Read']) $Value .= 'R';
+      if ($DbRow['Write']) $Value .= 'W';
       $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
     }
-    return($Result);
+    return ($Result);
   }
 
@@ -278 +278 @@
     $PermissionExists = false;
     // First try to check cache group-group relation
-    if(array_key_exists($GroupId, $this->PermissionGroupCache))
+    if (array_key_exists($GroupId, $this->PermissionGroupCache))
     {
       $PermissionExists = true;
@@ -287 +287 @@
         '") AND (`AssignedGroup` IS NOT NULL)');
       $DbRow = array();
-      while($DbRow[] = $DbResult->fetch_array());
+      while ($DbRow[] = $DbResult->fetch_array());
         $this->PermissionGroupCache[$GroupId] = $DbRow;
       $PermissionExists = true;
     }
-    if($PermissionExists)
-    {
-      foreach($this->PermissionGroupCache[$GroupId] as $DbRow)
-      {
-        if($DbRow['AssignedGroup'] != '')
-        if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
+    if ($PermissionExists)
+    {
+      foreach ($this->PermissionGroupCache[$GroupId] as $DbRow)
+      {
+        if ($DbRow['AssignedGroup'] != '')
+        if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
       }
     }
 
     // Check group-operation relation
-    if(array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
+    if (array_key_exists($GroupId.','.$OperationId, $this->PermissionGroupCacheOp))
     {
       $PermissionExists = true;
@@ -308 +308 @@
       // If no permission combination exists in cache, do new check of database items
       $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedOperation`="'.$OperationId.'"');
-      if($DbResult->num_rows > 0) $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = true;
+      if ($DbResult->num_rows > 0) $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = true;
         else $this->PermissionGroupCacheOp[$GroupId.','.$OperationId] = false;
       $PermissionExists = true;
     }
-    if($PermissionExists)
-    {
-      return($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
-    }
-    return(false);
+    if ($PermissionExists)
+    {
+      return ($this->PermissionGroupCacheOp[$GroupId.','.$OperationId]);
+    }
+    return (false);
   }
 
@@ -323 +323 @@
     // Get module id
     $DbResult = $this->Database->select('Module', 'Id', '`Name`="'.$Module.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $ModuleId = $DbRow['Id'];
-    } else return(false);
+    } else return (false);
 
     // First try to check cache
-    if(in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache))
+    if (in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache))
     {
       $OperationId = array_search(array($Module, $Operation, $ItemType, $ItemIndex), $this->PermissionCache);
@@ -339 +339 @@
       $DbResult = $this->Database->select('PermissionOperation', 'Id', '(`Module`="'.$ModuleId.
         '") AND (`Item`="'.$ItemType.'") AND (`ItemId`='.$ItemIndex.') AND (`Operation`="'.$Operation.'")');
-      if($DbResult->num_rows > 0)
+      if ($DbResult->num_rows > 0)
       {
         $DbRow = $DbResult->fetch_array();
@@ -352 +352 @@
     }
 
-    if($PermissionExists)
-    {
-      if($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
+    if ($PermissionExists)
+    {
+      if ($this->User['Id'] == null) $UserCondition = '(`User` IS NULL)';
         else $UserCondition = '(`User`="'.$this->User['Id'].'")';
       // Check user-operation relation
       $DbResult = $this->Database->select('PermissionUserAssignment', '*', $UserCondition.' AND (`AssignedOperation`="'.$OperationId.'")');
-      if($DbResult->num_rows > 0) return(true);
+      if ($DbResult->num_rows > 0) return (true);
 
       // Check user-group relation
       $DbResult = $this->Database->select('PermissionUserAssignment', 'AssignedGroup', $UserCondition);
-      while($DbRow = $DbResult->fetch_array())
-      {
-       if($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return(true);
-      }
-      return(false);
-    } else return(false);
+      while ($DbRow = $DbResult->fetch_array())
+      {
+       if ($this->CheckGroupPermission($DbRow['AssignedGroup'], $OperationId) == true) return (true);
+      }
+      return (false);
+    } else return (false);
   }
 
@@ -373 +373 @@
   {
     $DbResult = $this->Database->select('User', 'Login, Name, Id, Email, Password', '`Login`="'.$Login.'" AND `Email`="'.$Email.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_array();
@@ -394 +394 @@
       $this->System->ModuleManager->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'Login='.$Login.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
-    return($Output);
+    return ($Output);
   }
 
@@ -400 +400 @@
   {
     $DbResult = $this->Database->select('User', 'Id, Login, Password', 'Id = '.$Id);
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $Row = $DbResult->fetch_array();
       $NewPassword2 = substr(sha1(strtoupper($Row['Login'])), 0, 7);
-      if(($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
+      if (($NewPassword == $NewPassword2) and ($Hash == $Row['Password']))
       {
         $PasswordHash = new PasswordHash();
@@ -414 +414 @@
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
-    return($Output);
+    return ($Output);
   }
 
@@ -420 +420 @@
   {
     $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
-    if($DbResult->num_rows > 0)
+    if ($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $User = new User($this->System);
       $User->User = array('Id' => $DbRow['User']);
-      return($User->CheckPermission($Module, $Operation));
-    } else return(false);
+      return ($User->CheckPermission($Module, $Operation));
+    } else return (false);
   }
 }