Changeset 526 for trunk/Modules/Portal

Timestamp:

Apr 21, 2013, 10:23:56 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka HyperLink přejmenována na obecnější název Action. Odkazy na názvy ikony přepracovány na samostatnou tabulku.
• Upraveno: Funkce týkající se fronty mailů odděleny do samostatného souboru.

File:

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

trunk/Modules/Portal/Portal.php

@@ -8 +8 @@
   var $ShortTitle = 'Rozcestník';
   
-  function ShowLinks($HyperlinkGroup)
+  function ShowActions($ActionGroup)
   {
     $Output = '';
-    $DbResult = $this->Database->query('SELECT * FROM `Hyperlink` WHERE (`Group`='.$HyperlinkGroup['Id'].') AND (`Enable` = 1)');
-    while($HyperLink = $DbResult->fetch_assoc())
-    {
-      if($HyperLink['IconFile'] == '') $HyperLink['IconFile'] = 'clear.png';
-        if(substr($HyperLink['URL'], 0, 4) != 'http') $HyperLink['URL'] = $this->System->Config['Web']['RootFolder'].$HyperLink['URL'];
-        if(($HyperLink['PermissionModule'] == '') or (($HyperLink['PermissionModule'] != '') and $this->System->User->User->CheckPermission($HyperLink['PermissionModule'], $HyperLink['PermissionOperation'])))        
-        $Output .= '<img alt="'.$HyperLink['Name'].'" src="images/favicons/'.$HyperLink['IconFile'].'" width="16" height="16" /> <a href="'.$HyperLink['URL'].'">'.$HyperLink['Name'].'</a><br />';
-    }
-    return($this->Panel($HyperlinkGroup['Name'], $Output));
+    $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())
+    {
+      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 />';
+    }
+    return($this->Panel($ActionGroup['Name'], $Output));
   }
 
@@ -305 +306 @@
     }
 
-    $DbResult = $this->Database->query('SELECT * FROM `HyperlinkGroup`');
+    $DbResult = $this->Database->query('SELECT * FROM `ActionGroup`');
     while($DbRow = $DbResult->fetch_assoc())
-      $HyperlinkGroups[$DbRow['Id']] = $DbRow;
+      $ActionGroups[$DbRow['Id']] = $DbRow;
 
     // Show pannels
@@ -322 +323 @@
       while($Panel = $DbResult2->fetch_assoc())
       {
-        if($Panel['Module'] == 'HyperlinkGroup') $Output .= $this->ShowLinks($HyperlinkGroups[$Panel['Parameters']]);
+        if($Panel['Module'] == 'ActionGroup') $Output .= $this->ShowActions($ActionGroups[$Panel['Parameters']]);
         else if($Panel['Module'] == 'OnlineHostList') $Output .= $this->Panel('Online počítače', $this->OnlineHostList());
         else if($Panel['Module'] == 'UserOptions')