Changeset 15 for user.php

Timestamp:

Oct 19, 2008, 8:16:37 PM (16 years ago)

Author:

george

Message:

• Upraveno: Mezitabulkovéí odkazy na položky jsou nyní realizovány jako odkazy na id položky(ItemId) namísto id řádku v tabulce(Id).

File:

• user.php (modified) (7 diffs)

user.php

@@ -69 +69 @@
     {
       $this->Database->delete($this->TableUserOnline, 'User='.$DbRow['User']);
-      $this->System->Modules['Log']->NewRecord('User', 'Logout');
+      //$this->System->Modules['Log']->Add('User', 'Logout');
     }
     //$this->LoadPermission($this->User['Role']);
@@ -102 +102 @@
           mail($Email, $Subject, $Message, $AdditionalHeaders);
           $Result = USER_REGISTRATED;
-          $this->System->Modules['Log']->NewRecord('User', 'NewRegistration', $Nick);
+          //$this->System->Modules['Log']->NewRecord('User', 'NewRegistration', $Nick);
         }
       }
@@ -119 +119 @@
         $this->Database->update($this->TableUser, 'Id='.$Row['Id'], array('Locked' => 0));
         $Output = USER_REGISTRATION_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'UserName='.$Row['Name']);
+        //$this->System->Modules['Log']->NewRecord('User', 'RegisterConfirm', 'UserName='.$Row['Name']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;
@@ -141 +141 @@
         // načtení stavu stromu
         $Result = USER_LOGGED_IN;
-        $this->System->Modules['Log']->NewRecord('User', 'Login', 'Nick='.$Nick.',Host='.gethostbyaddr(GetRemoteAddress()));
+        //$this->System->Modules['Log']->NewRecord('User', 'Login', 'Nick='.$Nick.',Host='.gethostbyaddr(GetRemoteAddress()));
       }
     } else $Result = USER_NOT_REGISTRED;
@@ -154 +154 @@
     $SID = session_id();
     $this->Database->update($this->TableUserOnline, 'SessionId="'.$SID.'"', array('User' => 0));
-    $this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Name']);
+    //$this->System->Modules['Log']->NewRecord('User', 'Logout', $this->User['Name']);
     $this->Check();
     return(USER_LOGGED_OUT);
-  }
-
-  function LoadRoles()
-  {
-    $this->Roles = array();
-    $DbResult = $this->Database->select('UserRole', '*');
-    while($DbRow = $DbResult->fetch_array())
-      $this->Roles[] = $DbRow;
-  }
-
-  function LoadPermission($Role)
-  {
-    $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())
-      $this->User['Permission'][$DbRow['Operation']] = $DbRow;
-  }
-
-  function PermissionMatrix()
-  {
-    $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())
-    {
-      $Value = '';
-      if($DbRow['Read']) $Value .= 'R';
-      if($DbRow['Write']) $Value .= 'W';
-      $Result[$DbRow['Description']][$DbRow['Title']] = $Value;
-    }
-    return($Result);
-  }
-
-  function CheckGroupPermission($GroupId, $OperationId)
-  {
-    // Check group-group relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `Type`="Group"');
-    while($DbRow = $DbResult->fetch_array())
-    {
-       if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
-    }
-
-    // Check group-operation relation
-    $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
-    if($DbResult->num_rows > 0) return(true); 
-    return(false);
-  }
-
-  function CheckPermission($Module, $Operation, $ItemType = '', $ItemIndex = 0)
-  {
-    $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$Module.'" AND `Item`="'.$ItemType.'" AND `ItemId`='.$ItemIndex.' AND `Operation`="'.$Operation.'"');
-    if($DbResult->num_rows > 0)
-    {
-      $DbRow = $DbResult->fetch_array();
-      $OperationId = $DbRow['Id'];
-
-      // Check user-operation relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', '*', '`User`="'.$this->User['Id'].'" AND `GroupOrOperation`="'.$OperationId.'" AND `Type`="Operation"');
-      if($DbResult->num_rows > 0) return(true);
-
-      // Check user-group relation
-      $DbResult = $this->Database->select('PermissionUserAssignment', 'GroupOrOperation', '`User`="'.$this->User['Id'].'" AND `Type`="Group"');
-      while($DbRow = $DbResult->fetch_array())
-      {
-         if($this->CheckGroupPermission($DbRow['GroupOrOperation'], $OperationId) == true) return(true);
-      }
-      return(false);
-    } else return(false);
   }
 
@@ -242 +174 @@
       mail($Row['Email'], $Subject, $Message, $AdditionalHeaders);
       $Output = USER_PASSWORD_RECOVERY_SUCCESS;
-      $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'UserName='.$Name.',Email='.$Email);
+      //$this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryRequest', 'UserName='.$Name.',Email='.$Email);
     } else $Output = USER_PASSWORD_RECOVERY_FAIL;
     return($Output);
@@ -258 +190 @@
         $this->Database->update($this->TableUser, 'Id='.$Row['Id'], array('Password' => sha1($NewPassword), 'Locked' => 0));
         $Output = USER_PASSWORD_RECOVERY_CONFIRMED;
-        $this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'UserName='.$Row['Name']);
+        //$this->System->Modules['Log']->NewRecord('User', 'PasswordRecoveryConfirm', 'UserName='.$Row['Name']);
       } else $Output = PASSWORDS_UNMATCHED;
     } else $Output = USER_NOT_FOUND;