Changeset 16 for base.php

Timestamp:

Oct 21, 2008, 9:05:41 AM (16 years ago)

Author:

george

Message:

• Opraveno: Načítání smazaných položek typů a seznamů.
• Upraveno: Menu nyní realizováno přes seznam SystemMenu namísto vlastností seznamů.
• Přidáno: Obrázky pro akce zobrazit, editovat a smazat.

File:

• base.php (modified) (8 diffs)

base.php

@@ -65 +65 @@
       }
     }
-    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'">Zobrazit</a> <a href="?Action=EditItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'">Editovat</a> <a href="?Action=DeleteItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'">Smazat</a></td></tr>';
+    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'"><img border="0" src="images/view.png" alt="Zobrazit" title="Zobrazit"></a> <a href="?Action=EditItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'"><img border="0" src="images/edit.png" alt="Editovat" title="Editovat"></a> <a href="?Action=DeleteItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['ItemId'].'"><img border="0" src="images/delete.png" alt="Smazat" title="Smazat"></a></td></tr>';
   }
   $Output .= '</table>';
@@ -137 +137 @@
 
     $Output .= '<td>'.$DbRow['CreationTime'].'</td>';
-    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Zobrazit</a> </td></tr>';
+    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'"><img border="0" src="images/view.png" alt="Zobrazit" title="Zobrazit"></a></td></tr>';
   }
   $Output .= '</table>';
@@ -210 +210 @@
   $Output .= ShowViewItem($List, $Id);
   $Form->Values['Column'] = $_POST['Column'];
+  $Form->Values['ItemId'] = $Id;
+  $Form->Values['ListTableName'] = $List['TableName'];
   ExecuteListEvent($List['TableName'], 'OnEdit', $Form->Values);
   return($Output);
@@ -284 +286 @@
   $NewItemId = $System->Modules['DatabaseList']->AddItem($List['TableName'], $Form->Values);
   $NewId = $Database->insert_id;
-   $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Add']);
+  $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Add']);
   $Output = 'Položka přidána';
   $Output .= ShowViewItem($List, $NewItemId);
@@ -350 +352 @@
 }
 
-function TableList($System)
-{
-  global $Lists;
-
-  $Type = array('Uživatelské', 'Systémové');
-  $Output = '<strong>'.$Type[$System].' seznamy:</strong><br />';
-  foreach($Lists as $Index => $List)
-  {
-    if(($List['System'] == $System) and ($List['VisibleInMenu'] == 1))
-      $Output .= '<a href="?Action=ShowList&amp;Table='.$Index.'">'.$List['Title'].'</a><br />';
+function ShowMenu()
+{
+  global $Lists, $Database;
+
+  $DbResult = $Database->query('SELECT t1.* FROM `SystemMenu` AS t1 LEFT JOIN `SystemMenu` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND (t1.DeletionTime IS NULL)');
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $Output .= '<strong>'.$DbRow['Name'].'</strong><br />';
+    $DbResult2 = $Database->query('SELECT t1.* FROM `SystemList` AS t1 LEFT JOIN `SystemList` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND (t1.DeletionTime IS NULL) AND (t1.`Menu` = '.$DbRow['ItemId'].')');
+    while($DbRow2 = $DbResult2->fetch_assoc())
+    {
+      //if(($List['System'] == $System) and ($List['VisibleInMenu'] == 1))
+      //if(CheckPermission('Read', $List['Id']))
+      $Output .= '<a href="?Action=ShowList&amp;Table='.$DbRow2['TableName'].'">'.$DbRow2['Title'].'</a><br />';
+    }
+    $Output .= '<br />';
   }
   $Output .= '<br />';
@@ -421 +429 @@
   global $Database, $Lists;
 
-  $DbResult = $Database->query('SELECT t1.* FROM `SystemList` AS t1 LEFT JOIN `SystemList` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)');
+  $DbResult = $Database->query('SELECT t1.* FROM `SystemList` AS t1 LEFT JOIN `SystemList` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND (t1.DeletionTime IS NULL)');
   while($DbRow = $DbResult->fetch_assoc())
   {
     $Items = array();
-    $DbResult2 = $Database->query('SELECT t1.* FROM `SystemListItem` AS t1 LEFT JOIN `SystemListItem` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND t1.List='.$DbRow['ItemId']);
+    $DbResult2 = $Database->query('SELECT t1.* FROM `SystemListItem` AS t1 LEFT JOIN `SystemListItem` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND (t1.DeletionTime IS NULL) AND (t1.List='.$DbRow['ItemId'].')');
     while($DbRow2 = $DbResult2->fetch_assoc())
     {
@@ -449 +457 @@
   $Types = array();
   $TypeNames = array();
-  $DbResult = $Database->query('SELECT t1.* FROM `SystemType` AS t1 LEFT JOIN `SystemType` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)');
+  $DbResult = $Database->query('SELECT t1.* FROM `SystemType` AS t1 LEFT JOIN `SystemType` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND (t1.DeletionTime IS NULL)');
   while($DbRow = $DbResult->fetch_assoc())
   {
@@ -503 +511 @@
 function CheckPermission($Right, $ListId, $ItemId = 0)
 {
-  global $Database;
+  global $Database, $System;
 
   $DbResult = $Database->query('SELECT t1.* FROM `Permission` AS t1 LEFT JOIN `Permission` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL) AND t1.PermissionGroup = (SELECT PermissionGroup.Id FROM PermissionGroup WHERE PermissionGroup.Id=(SELECT User.PermissionGroup FROM User WHERE User.ItemId='.$System->Modules['User']->User['Id'].' ORDER BY User.Id DESC LIMIT 1) ORDER BY PermissionGroup.Id DESC LIMIT 1) AND t1.DeletionTime IS NULL AND t1.List='.$ListId);