Changeset 584 for trunk/Modules/Portal

Timestamp:

Oct 31, 2013, 4:57:11 PM (11 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.

File:

• trunk/Modules/Portal/Portal.php (modified) (2 diffs)

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));