Changeset 584 for trunk/Modules

Timestamp:

Oct 31, 2013, 4:57:11 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Kontrola oprávnění při zobrazení informačního systému.
• Přidáno: Tabulka Module pro seznam existujících modulů.
• Upraveno: PermissionOperation se nyní odkazuje na id modulu.

Location:

trunk/Modules

Files:

• IS/IS.php (modified) (8 diffs)
• NetworkConfigLinux/Generators/DNS.php (modified) (1 diff)
• NetworkShare/SharePage.php (modified) (1 diff)
• OpeningHours/OpeningHours.php (modified) (2 diffs)
• Portal/Portal.php (modified) (2 diffs)
• User/User.php (modified) (3 diffs)

trunk/Modules/IS/IS.php

@@ -75 +75 @@
   {
     $Output = '';
+    if(!$this->System->User->CheckPermission($Table, 'Write'))
+      return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
     {
@@ -123 +125 @@
   {
     $Output = '';
+    if(!$this->System->User->CheckPermission($Table, 'Write'))
+      return('Nemáte oprávnění');
     $this->Database->delete($Table, 'Id='.$Id);
     $Output .= $this->SystemMessage('Odstranění položky', 'Položka odstraněna');
@@ -132 +136 @@
   {
     $Output = '';
+    if(!$this->System->User->CheckPermission($Table, 'Write'))
+      return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
     {
@@ -182 +188 @@
     if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
+    if(!$this->System->User->CheckPermission($Table, 'Read'))
+      return('Nemáte oprávnění');
     
     $Form = new Form($this->System->FormManager);
@@ -383 +391 @@
   function ShowSelect($Table, $Filter = '', $Title = '')
   { 
+    if(!$this->System->User->CheckPermission($Table, 'Read'))
+      return('Nemáte oprávnění');
     $this->BasicHTML = true;
     $this->HideMenu = true;
@@ -394 +404 @@
   function ShowMapSelect($Table, $Filter = '', $Title = '')
   {
+    if(!$this->System->User->CheckPermission($Table, 'Write'))
+      return('Nemáte oprávnění');
     $MapApi = new MapApiGoogle($this->System);
     $MapApi->Position = array('Lat' => $this->System->Config['Map']['DefaultLatitude'], 
@@ -407 +419 @@
   function ShowList($Table, $Filter = '', $Title = '', $ExcludeColumn = '')  
   {
+    if(!$this->System->User->CheckPermission($Table, 'Read'))
+      return('Nemáte oprávnění');
     $RowActions = '<a href="?a=view&amp;t='.$Table.'&amp;i=#RowId"><img alt="Ukázat" title="Ukázat" src="'.
       $this->System->Link('/images/view.png').'"/></a>'.
@@ -521 +535 @@
         'Items' => array('Type' => 'TMenuItemListMenu', 'Caption' => 'Položky'),
       ),
-    ));
-    
+    ));    
   }  
   

trunk/Modules/NetworkConfigLinux/Generators/DNS.php

@@ -117 +117 @@
   'Host' => array(),
   'Alias' => array(),
-  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', '10.145.68', '10.145.69', '10.145.70', '10.145.71', '77.92.221', '172.16.0', '172.16.1'),
+  'Network' => array('10.145.64', '10.145.65', '10.145.66', '10.145.67', 
+    '10.145.68', '10.145.69', '10.145.70', '10.145.71', '77.92.221', '172.16.0', 
+    '172.16.1'),
 );
 

trunk/Modules/NetworkShare/SharePage.php

@@ -68 +68 @@
   function Show()
   {
-    if(!$this->System->User->CheckPermission('Share', 'Display')) return('Nemáte oprávnění');
+    if(!$this->System->User->CheckPermission('NetworkShare', 'Display')) return('Nemáte oprávnění');
 
     // If not only online checkbox checked

trunk/Modules/OpeningHours/OpeningHours.php

@@ -36 +36 @@
   function EditSubject($Id)
   {
-    if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
+    if($this->System->User->CheckPermission('OpeningHours', 'Edit'))
     {
       $Output = '<div class="Centred">';
@@ -78 +78 @@
     
     $Output = '';
-    if($this->System->User->CheckPermission('SubjectOpenTime', 'Edit'))
+    if($this->System->User->CheckPermission('OpeningHours', 'Edit'))
     {
       $this->Database->delete('SubjectOpenTimeDay', 'Subject='.$Id);

trunk/Modules/Portal/Portal.php

@@ -105 +105 @@
   {
     $Output = '';
-    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+    $DbResult = $this->Database->query('SELECT *, `ActionIcon`.`Name` AS `Icon` FROM `Action` '.
+      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
       'WHERE (`Group`='.$ActionGroup['Id'].') AND (`Enable` = 1)');
     while($Action = $DbResult->fetch_assoc())
@@ -111 +112 @@
       if($Action['Icon'] == '') $Action['Icon'] = 'clear.png';
         if(substr($Action['URL'], 0, 4) != 'http') $Action['URL'] = $this->System->Link($Action['URL']);
-        if(($Action['PermissionModule'] == '') or (($Action['PermissionModule'] != '') and $this->System->User->User->CheckPermission($Action['PermissionModule'], $Action['PermissionOperation'])))        
-        $Output .= '<img alt="'.$Action['Title'].'" src="images/favicons/'.$Action['Icon'].'" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a><br />';
+        if($Action['PermissionOperation'] != '') 
+        {
+          $DbResult2 = $this->Database->query('SELECT * FROM PermissionOperation'.
+            ' LEFT JOIN Module ON Module.Id=PermissionOperation.Module'.
+            ' WHERE Id='.$Action['PermissionOperation']);
+          $DbRow2 = $DbResult2->fetch_assoc();
+          if($this->System->User->User->CheckPermission($DbRow2['Module'], $DbRow2['Operation']))
+            $Allowed = true; else $Allowed = false;        
+        } else $Allowed = true;
+        if($Allowed)
+          $Output .= '<img alt="'.$Action['Title'].'" src="images/favicons/'.$Action['Icon'].'" width="16" height="16" /> <a href="'.$Action['URL'].'">'.$Action['Title'].'</a><br />';
     }
     return($this->Panel($ActionGroup['Name'], $Output));

trunk/Modules/User/User.php

@@ -290 +290 @@
   function CheckPermission($Module, $Operation, $ItemType = '', $ItemIndex = 0)
   {
+    // Get module id
+    $DbResult = $this->Database->select('Module', 'Id', '`Name`="'.$Module.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $ModuleId = $DbRow['Id'];
+    } else return(false);
+    
     // First try to check cache
     if(in_array(array($Module, $Operation, $ItemType, $ItemType), $this->PermissionCache)) 
@@ -298 +306 @@
     {    
       // If no permission combination exists in cache, do new check of database items
-      $DbResult = $this->Database->select('PermissionOperation', 'Id', '`Module`="'.$Module.'" 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)
       {
@@ -456 +464 @@
       'Table' => 'PermissionOperation',
       'Items' => array(
-        'Module' => array('Type' => 'String', 'Caption' => 'Modul', 'Default' => ''),
+        'Module' => array('Type' => 'TModule', 'Caption' => 'Modul', 'Default' => ''),
         'Operation' => array('Type' => 'String', 'Caption' => 'Operace', 'Default' => ''),
         'Item' => array('Type' => 'String', 'Caption' => 'Položka', 'Default' => ''),