Changeset 668 for trunk/Modules/User

Timestamp:

Jul 15, 2014, 9:48:54 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: Přístup k RSS kanálům přes přístupový token.

File:

• trunk/Modules/User/User.php (modified) (4 diffs)

trunk/Modules/User/User.php

@@ -285 +285 @@
     {
       // If no permission combination exists in cache, do new check of database items
-      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '`Group`="'.$GroupId.'" AND `AssignedGroup` IS NOT NULL');
+      $DbResult = $this->Database->select('PermissionGroupAssignment', '*', '(`Group`="'.$GroupId.
+        '") AND (`AssignedGroup` IS NOT NULL)');
       $DbRow = array();
       while($DbRow[] = $DbResult->fetch_array());
-      $this->PermissionGroupCache[$GroupId] = $DbRow;
+        $this->PermissionGroupCache[$GroupId] = $DbRow;
       $PermissionExists = true;
     }
@@ -337 +338 @@
     {
       // If no permission combination exists in cache, do new check of database items
-      $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$ModuleId.'" AND `Item`="'.$ItemType.'" AND `ItemId`='.$ItemIndex.' AND `Operation`="'.$Operation.'"');
+      $DbResult = $this->Database->select('PermissionOperation', 'Id', '(`Module`="'.$ModuleId.
+        '") AND (`Item`="'.$ItemType.'") AND (`ItemId`='.$ItemIndex.') AND (`Operation`="'.$Operation.'")');
       if($DbResult->num_rows > 0)
       {
@@ -414 +416 @@
     } else $Output = USER_NOT_FOUND;
     return($Output);
+  }
+
+  function CheckToken($Module, $Operation, $Token)
+  {
+    $DbResult = $this->Database->select('APIToken', 'User', '`Token`="'.$Token.'"');
+    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);
   }
 }
@@ -583 +597 @@
       ),
     ));
+    $this->System->FormManager->RegisterClass('APIToken', array(
+      'Title' => 'Přístupový token',
+      'Table' => 'APIToken',
+      'Items' => array(
+        'User' => array('Type' => 'TUser', 'Caption' => 'Uživatel', 'Default' => ''),
+        'Token' => array('Type' => 'String', 'Caption' => 'Token', 'Default' => ''),
+      ),
+    ));
     $this->System->FormManager->RegisterClass('User', array(
       'Title' => 'Uživatelé',