Changeset 585

Timestamp:

Oct 31, 2013, 8:57:41 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: V modulu IS se oprávnění kontroluje nyní pomocí názvů modulů ísto chybného jména tabulky.

Location:

trunk

Files:

• Common/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (11 diffs)

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 584; // Subversion revision
-$DatabaseRevision = 544; // SQL structure revision
+$Revision = 585; // Subversion revision
+$DatabaseRevision = 584; // SQL structure revision
 $ReleaseTime = '2013-10-31';

trunk/Modules/IS/IS.php

@@ -8 +8 @@
   var $ShortTitle = 'Správa dat';
   var $ParentClass = 'PagePortal';
-  var $MenuItems = array();
-  var $MenuItemsLoaded = false;
+  var $MenuItems;
   var $HideMenu = false;
 
@@ -36 +35 @@
     {
       $Output = '<table style="width: 100%"><tr><td style="width: 20%; vertical-align: top;">';
-      $Output .= '<strong>Nabídka:</strong>'.$this->ShowMenuItem(''); 
+      $Output .= '<strong>Nabídka:</strong>'.$this->ShowMenu(); 
       $Output .= '</td><td style="width: 80%; vertical-align: top;">';
       $Output .= $Content;
@@ -75 +74 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($Table, 'Write'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
@@ -125 +124 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($Table, 'Write'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     $this->Database->delete($Table, 'Id='.$Id);
@@ -136 +135 @@
   {
     $Output = '';
-    if(!$this->System->User->CheckPermission($Table, 'Write'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     if(array_key_exists('o', $_GET))
@@ -188 +187 @@
     if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
-    if(!$this->System->User->CheckPermission($Table, 'Read'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
     
@@ -391 +390 @@
   function ShowSelect($Table, $Filter = '', $Title = '')
   { 
-    if(!$this->System->User->CheckPermission($Table, 'Read'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Read'))
       return('Nemáte oprávnění');
     $this->BasicHTML = true;
@@ -404 +403 @@
   function ShowMapSelect($Table, $Filter = '', $Title = '')
   {
-    if(!$this->System->User->CheckPermission($Table, 'Write'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
     $MapApi = new MapApiGoogle($this->System);
@@ -419 +418 @@
   function ShowList($Table, $Filter = '', $Title = '', $ExcludeColumn = '')  
   {
-    if(!$this->System->User->CheckPermission($Table, 'Read'))
+    if(!$this->System->User->CheckPermission($this->TableToModule($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="'.
@@ -457 +456 @@
   }
   
+  function ShowMenu()
+  {
+    $this->MenuItems = array();
+    $DbResult = $this->Database->query('SELECT `MenuItem`.`Id`, `MenuItem`.`Name`, `MenuItem`.`Parent`, `Action`.`URL` AS `URL`, `ActionIcon`.`Name` AS `IconName`, `Action`.`PermissionOperation` AS `Permission` FROM `MenuItem` '.
+      'LEFT JOIN `Action` ON `Action`.`Id` = `MenuItem`.`Action` '.
+      'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
+      'WHERE `MenuItem`.`Menu`=1 '.
+      'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      //if($DbRow['Permission'] != '')
+      $this->MenuItems[$DbRow['Id']] = $DbRow;
+    }
+    return($this->ShowMenuItem(''));
+  }
+  
   function ShowMenuItem($Parent)
   {
-    if($this->MenuItemsLoaded == false)
-    {
-      $DbResult = $this->Database->query('SELECT `MenuItem`.`Id`, `MenuItem`.`Name`, `MenuItem`.`Parent`, `Action`.`URL` AS `URL`, `ActionIcon`.`Name` AS `IconName`  FROM `MenuItem` '.
-        'LEFT JOIN `Action` ON `Action`.`Id` = `MenuItem`.`Action` '.
-        'LEFT JOIN `ActionIcon` ON `ActionIcon`.`Id` = `Action`.`Icon` '.
-        'ORDER BY `MenuItem`.`Parent`,`MenuItem`.`Name`');
-      while($DbRow = $DbResult->fetch_assoc())
-      {
-        $this->MenuItems[$DbRow['Id']] = $DbRow;
-      }
-      $this->MenuItemsLoaded = true;
-    }    
-    
     $Output = '<ul style="list-style: none; margin-left:1em; padding-left:0em;">';
     foreach($this->MenuItems as $MenuItem)
@@ -489 +491 @@
     $Output .= '</ul>';
     return($Output);
+  }
+  
+  function TableToModule($Table)
+  {
+    $DbResult = $this->Database->query('SELECT (SELECT Name FROM Module WHERE Module.Id=Model.Module) AS Name FROM Model WHERE Name="'.$Table.'"');
+    if($DbResult->num_rows == 1)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      return($DbRow['Name']);      
+    } else return('');
   }
 }