Changeset 13

Timestamp:

Oct 13, 2008, 1:56:05 PM (16 years ago)

Author:

george

Message:

• Přidáno: Automatické zaznamenávání historie operací nad seznamy do tabulky SystemLog.
• Upraveno: Nová třída pro databázovou obsluhu seznamů oddělená od souboru obstarávajícího komunikaci pomocí webu.
• Opraveno: Chybná podmínka zobrazování skrytých políček formulářů.
• Přidáno: Zobrazování chyb databázových povelů.

Files:

• base.php (modified) (13 diffs)
• database.php (modified) (5 diffs)
• database_list.php (added)
• forms.php (modified) (4 diffs)
• global.php (modified) (2 diffs)
• lists/SystemListItem.php (modified) (1 diff)
• lists/include.php (added)
• log.php (modified) (1 diff)
• types/include.php (added)

base.php

@@ -1 +1 @@
 <?php
-
-// Include type definitions
-include('types/Enumeration.php');
-include('types/Boolean.php');
-include('types/Integer.php');
-include('types/String.php');
-include('types/PointerOneToMany.php');
-include('types/PointerOneToOne.php');
-include('types/Date.php');
-include('types/Password.php');
-include('types/Float.php');
-include('types/Hyperlink.php');
-include('types/Hidden.php');
-
-// Include list events definitions
-include('lists/SystemList.php');
-include('lists/SystemListItem.php');
 
 function ShowList($List, $Column = '', $ColumnValue = 0, $Title = '')
@@ -44 +27 @@
     $FullListLink = '';
   }
+
+  // Handle ordering
+  if(array_key_exists('OrderColumn', $_GET))
+  {
+    if($_SESSION['OrderColumn'] == $_GET['OrderColumn']) // Same column => reverse orded
+      $_SESSION['OrderDirection'] = ($_SESSION['OrderDirection'] + 1) % 2; 
+    if($_SESSION['OrderTable'] != $List['TableName']) // Different table => set ascending order
+      $_SESSION['OrderDirection'] = 0;
+    $_SESSION['OrderColumn'] = $_GET['OrderColumn'];
+    $_SESSION['OrderTable'] = $List['TableName'];
+  }
+  if(array_key_exists('OrderColumn', $_SESSION) and ($_SESSION['OrderTable'] == $List['TableName']))
+  {
+    $OrderDirection = array('ASC', 'DESC');
+    $Order = 'ORDER BY t1.`'.$_SESSION['OrderColumn'].'` '.$OrderDirection[$_SESSION['OrderDirection']];
+  } else $Order = '';
+
+  if(array_key_exists('Page', $_GET)) $Page = $_GET['Page']; else $Page = 0;
+  //$Where .= ' AND (ValidFromTime <= NOW()) AND ((ValidToTime >= NOW()) OR (ValidToTime IS NULL))';
+  $Where .= ' '.$Order;
+  $DbResult = $Database->query('SELECT COUNT(t2.Id) AS Count FROM (SELECT DISTINCT(ItemId) as Id FROM `'.$List['TableName'].'` as t1 WHERE 1'.$Where.') as t2');
+  $DbRow = $DbResult->fetch_row();
+  $TotalItemCount = $DbRow[0];
+
+  $DbResult = $Database->query('SELECT t1.* FROM `'.$List['TableName'].'` AS t1 LEFT JOIN `'.$List['TableName'].'` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)'.$Where.' LIMIT '.($Page * $Config['Web']['ItemsPerPage']).', '.$Config['Web']['ItemsPerPage']);
+  while($DbRow = $DbResult->fetch_assoc())
+  {
+    $Output .= '<tr>';
+    foreach($List['Items'] as $Index => $Item)
+    {
+      if($Item['VisibleInList'] == 1)
+      {
+        $ItemDefinition = array('Name' => $Index, 'Value' => $DbRow[$Index], 'SourceTable' => $List['TableName'], 'SourceItemId' => $DbRow['Id'], 'Type' => $Item['Type']);
+        $Output .= '<td>'.ExecuteTypeEvent($Item['Type'], 'OnView', $ItemDefinition).'</td>';
+      }
+    }
+    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Zobrazit</a> <a href="?Action=EditItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Editovat</a> <a href="?Action=DeleteItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Smazat</a></td></tr>';
+  }
+  $Output .= '</table>';
+  $PageList = PagesList($Page, $TotalItemCount);
+  if(strlen($PageList) != 0) $Output .= $PageList.'<br />';
+  $Output .= ' <a href="?Action=AddItem&amp;Table='.$List['TableName'].$ColumnSelection.'">Přidat</a> '.$FullListLink;
+  return($Output);
+}
+
+function ShowHistory($List, $Id, $Title = '')
+{
+  global $Database, $Types, $Config;
+
+  if($Title == '') $Output = '<div>'.$List['Title'].'</div>';
+    else $Output = '<div>'.$Title.'</div>';
+  $Output .= '<table class="WideTable"><tr>';
+  foreach($List['Items'] as $Item)
+  {
+    if($Item['VisibleInList'] == 1)
+      $Output .= '<th><a href="?OrderColumn='.$Item['Name'].'">'.$Item['TextBefore'].'</a></th>';
+  }
+  $Output .= '<th><a href="?OrderColumn=Author">Autor</a></th><th><a href="?OrderColumn=CreationTime">Čas vytvoření</a></th><th>Akce</th></tr>';
+
+  $Where = ' AND (ItemId='.$Id.')';
 
   // Handle ordering
@@ -69 +112 @@
   $TotalItemCount = $DbRow[0];
 
-  $DbResult = $Database->query('SELECT t1.* FROM `'.$List['TableName'].'` AS t1 LEFT JOIN `'.$List['TableName'].'` AS t2 ON t1.ItemId=t2.ItemId AND t1.Id < t2.Id WHERE (t2.ItemId IS NULL)'.$Where.' LIMIT '.($Page * $Config['Web']['ItemsPerPage']).', '.$Config['Web']['ItemsPerPage']);
-  //echo($Database->LastQuery.'<br>');
-  while($DbRow = $DbResult->fetch_array())
-  {
-    $Output .= '<tr>';
-    foreach($List['Items'] as $Index => $Item)
-    {
-      if($Item['VisibleInList'] == 1)
-      {
-        $ItemDefinition = array('Name' => $Index, 'Value' => $DbRow[$Index], 'SourceTable' => $List['TableName'], 'SourceItemId' => $DbRow['Id'], 'Type' => $Item['Type']);
-        $Output .= '<td>'.ExecuteTypeEvent($Item['Type'], 'OnView', $ItemDefinition).'</td>';
-      }
-    }
-    $Output .= '<td><a href="?Action=ViewItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Zobrazit</a> <a href="?Action=EditItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Editovat</a> <a href="?Action=DeleteItem&amp;Table='.$List['TableName'].'&amp;Item='.$DbRow['Id'].'">Smazat</a></td></tr>';
-  }
-  $Output .= '</table>';
-  $Output .= PagesList($Page, $TotalItemCount);
-  $Output .= '<a href="?Action=AddItem&amp;Table='.$List['TableName'].$ColumnSelection.'">Přidat</a> '.$FullListLink;
-  return($Output);
-}
-
-function ShowHistory($List, $Id, $Title = '')
-{
-  global $Database, $Types, $Config;
-
-  if($Title == '') $Output = '<div>'.$List['Title'].'</div>';
-    else $Output = '<div>'.$Title.'</div>';
-  $Output .= '<table class="WideTable"><tr>';
-  foreach($List['Items'] as $Item)
-  {
-    if($Item['VisibleInList'] == 1)
-      $Output .= '<th><a href="?OrderColumn='.$Item['Name'].'">'.$Item['TextBefore'].'</a></th>';
-  }
-  $Output .= '<th><a href="?OrderColumn=Author">Autor</a></th><th><a href="?OrderColumn=CreationTime">Čas vytvoření</a></th><th>Akce</th></tr>';
-
-  $Where = ' AND (ItemId='.$Id.')';
-
-  // Handle ordering
-  if(array_key_exists('OrderColumn', $_GET))
-  {
-    if($_SESSION['OrderColumn'] == $_GET['OrderColumn']) // Same column => reverse orded
-      $_SESSION['OrderDirection'] = ($_SESSION['OrderDirection'] + 1) % 2; 
-    if($_SESSION['OrderTable'] != $List['TableName']) // Different table => set ascending order
-      $_SESSION['OrderDirection'] = 0;
-    $_SESSION['OrderColumn'] = $_GET['OrderColumn'];
-    $_SESSION['OrderTable'] = $List['TableName'];
-  }
-  if(array_key_exists('OrderColumn', $_SESSION) and ($_SESSION['OrderTable'] == $List['TableName']))
-  {
-    $OrderDirection = array('ASC', 'DESC');
-    $Order = 'ORDER BY t1.`'.$_SESSION['OrderColumn'].'` '.$OrderDirection[$_SESSION['OrderDirection']];
-  } else $Order = '';
-
-  if(array_key_exists('Page', $_GET)) $Page = $_GET['Page']; else $Page = 0;
-  //$Where .= ' AND (ValidFromTime <= NOW()) AND ((ValidToTime >= NOW()) OR (ValidToTime IS NULL))';
-  $Where .= ' '.$Order;
-  $DbResult = $Database->query('SELECT COUNT(t2.Id) AS Count FROM (SELECT DISTINCT(ItemId) as Id FROM `'.$List['TableName'].'` as t1 WHERE 1'.$Where.') as t2');
-  //echo($Database->LastQuery.'<br>');
-  $DbRow = $DbResult->fetch_array();
-  $TotalItemCount = $DbRow[0];
-
   $DbResult = $Database->query('SELECT * FROM `'.$List['TableName'].'` AS t1 WHERE 1'.$Where.' LIMIT '.($Page * $Config['Web']['ItemsPerPage']).', '.$Config['Web']['ItemsPerPage']);
   //echo($Database->LastQuery.'<br>');
@@ -156 +138 @@
   $Output .= '</table>';
   $Output .= PagesList($Page, $TotalItemCount);
-  $Output .= '<a href="?Action=ShowList&amp;Table='.$List['TableName'].'">Celkový seznam</a>';
+  $Output .= ' <a href="?Action=ShowList&amp;Table='.$List['TableName'].'">Celkový seznam</a>';
   return($Output);
 }
@@ -197 +179 @@
 function ShowEditItemFinish($List, $Id)
 {
-  global $Database, $Types, $System;
+  global $Database, $Types, $System, $LogActionType;
 
   $DbResult = $Database->select($List['TableName'], '*', 'Id='.$Id);
@@ -219 +201 @@
   );
   $Form->LoadValuesFromForm();
-
-  $DbResult = $Database->select($List['TableName'], 'ItemId', 'Id='.$Id);
-  $DbRow = $DbResult->fetch_assoc();
-  $Form->Values['ItemId'] = $DbRow['ItemId'];
-  $Form->Values['Author'] = $System->Modules['User']->User['Id'];
-  $Form->Values['CreationTime'] = 'NOW()';
-  $Form->Values['ValidTimeFrom'] = 'NOW()';
-  $Database->insert($List['TableName'], $Form->Values);
-  //echo($Database->LastQuery);
+  $System->Modules['DatabaseList']->EditItem($List['TableName'], $Form->Values, $Id);
+  $NewId = $Database->insert_id;
+  $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Edit']);
   $Output = 'Změny uloženy.';
-  $Output .= ShowViewItem($List, $Database->insert_id);
+  $Output .= ShowViewItem($List, $NewId);
   $Form->Values['Column'] = $_POST['Column'];
   ExecuteListEvent($List['TableName'], 'OnEdit', $Form->Values);
@@ -277 +253 @@
 function ShowAddItemFinish($List)
 {
-  global $Database, $Types, $System;
+  global $Database, $Types, $System, $LogActionType;
 
   $DefinitionItems = array();
@@ -294 +270 @@
     }
   }
-  $DefinitionItems[] = array('Name' => 'Column', 'Type' => 'Hidden', 'Caption' => '', 'Value' => $Column);
 
   $Form = new Form();
@@ -304 +279 @@
   );
   $Form->LoadValuesFromForm();
-  $Form->Values['Author'] = $System->Modules['User']->User['Id'];
-  $Form->Values['CreationTime'] = 'NOW()';
-  $Form->Values['ValidTimeFrom'] = 'NOW()';
-  $DbResult = $Database->select($List['TableName'], 'MAX(ItemId)');
-  $DbRow = $DbResult->fetch_row();
-  $AutoincrementId = $DbRow[0];
-  $Form->Values['ItemId'] = $AutoincrementId + 1; 
-  $Database->insert($List['TableName'], $Form->Values);
-  //echo($Database->LastQuery);
+  $System->Modules['DatabaseList']->AddItem($List['TableName'], $Form->Values);
+  $NewId = $Database->insert_id;
+  $System->Modules['Log']->Add($List['Id'], $NewId, $LogActionType['Add']);
   $Output = 'Položka přidána';
-  $Output .= ShowViewItem($List, $Database->insert_id);
+  $Output .= ShowViewItem($List, $NewId);
   $Form->Values['Column'] = $_POST['Column'];
   ExecuteListEvent($List['TableName'], 'OnAdd', $Form->Values);
@@ -368 +337 @@
 function ShowDeleteItem($List, $Id)
 {
-  global $Database, $Lists;
-
-  $Database->update($List['TableName'], 'Id='.$Id, array('DeletionTime' => 'NOW()'));
+  global $Database, $Lists, $System, $LogActionType;
+
+  $System->Modules['Log']->Add($List['Id'], $Id, $LogActionType['Delete']);
+  $System->Modules['DatabaseList']->DeleteItem($List['TableName'], $Id);
   $Output = 'Položka smazána.';
   $Output .= ShowList($Lists[$_SESSION['Table']], $Lists[$_SESSION['Column']], $Lists[$_SESSION['ColumnValue']]).'<br /><br />';
+  ExecuteListEvent($List['TableName'], 'OnDelete', $Id);
   return($Output);
 }
@@ -396 +367 @@
 
   $PermanentVar = array('Table', 'Item', 'Column', 'ColumnValue', 'Action');
+  if($_GET['Table'] != $_SESSION['Table'])
+  {
+    $_SESSION['Column'] = '';
+    $_SESSION['ColumnValue'] = '';
+  }
   foreach($PermanentVar as $Var)
   {
@@ -446 +422 @@
   {
     $Items = array();
-    $DbResult2 = $Database->select('SystemListItem', '`Name`, `TextBefore`, `TextAfter`, `Type`, `Default`, `Help`, `Required`, `Editable`, `VisibleInList`, `VisibleInPointer`', 'List='.$DbRow['Id']);
+    $DbResult2 = $Database->select('SystemListItem', '`Id`, `Name`, `TextBefore`, `TextAfter`, `Type`, `Default`, `Help`, `Required`, `Editable`, `VisibleInList`, `VisibleInPointer`', 'List='.$DbRow['Id']);
     while($DbRow2 = $DbResult2->fetch_assoc())
     {
@@ -452 +428 @@
     }
     $List = array(
+     'Id' => $DbRow['Id'],
      'TableName' => $DbRow['TableName'],
      'Title' => $DbRow['Title'],

database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2007-07-19
+// Date: 2008-10-13
 
 class Database extends mysqli
@@ -8 +8 @@
   var $Prefix = '';
   var $LastQuery = '';
-  
+  var $ShowError = 0;
+
   function query($Query)
   {
     $this->LastQuery = $Query;
-    return(parent::query($Query));
+    $DbResult = parent::query($Query);
+    if(($this->ShowError == TRUE) and ($this->error != ''))
+    {
+      echo('<strong>Database error:</strong> '.$this->error.'<br /><strong>Query:</strong> '.$Query.'<br />');
+      //echo('<pre>'); print_r(debug_backtrace()); echo('</pre>');
+    }
+    return($DbResult);
   }
 
   function select($Table, $What = '*', $Condition = 1)
   {
-    $this->LastQuery = "SELECT ".$What." FROM `".$this->Prefix.$Table."` WHERE ".$Condition; 
-    return($this->query($this->LastQuery));
+    return($this->query("SELECT ".$What." FROM `".$this->Prefix.$Table."` WHERE ".$Condition));
   }
 
   function delete($Table, $Condition)
   {
-    $this->LastQuery = "DELETE FROM `".$this->Prefix.$Table."` WHERE ".$Condition;
-    $this->query($this->LastQuery);
+    $this->query("DELETE FROM `".$this->Prefix.$Table."` WHERE ".$Condition);
   }
-  
+
   function insert($Table, $Data)
   {
@@ -35 +40 @@
       $Value = strtr($Value, '"', '\"');
       $Name .= ',`'.$Key.'`';
-            if($Value == 'NOW()') $Values .= ",".$Value;
-              else $Values .= ",'".$Value."'";
+      if($Value == 'NOW()') $Values .= ",".$Value;
+        else $Values .= ",'".$Value."'";
     }
     $Name = substr($Name, 1);
     $Values = substr($Values, 1);
-    $this->LastQuery = 'INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
-    $this->query($this->LastQuery);
+    $this->query('INSERT INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
   }
-  
+
   function update($Table, $Condition, $Data)
   {
@@ -49 +53 @@
     foreach($Data as $Key => $Value)
     {
-            $Value = strtr($Value, '"', '\"');
+      $Value = strtr($Value, '"', '\"');
       if($Value != 'NOW()') $Value = "'".$Value."'";
       $Values .= ", ".$Key."=".$Value;
     }
-    $Values = substr($Values, 2);  
-    $this->LastQuery = 'UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')';
-    $this->query($this->LastQuery);
+    $Values = substr($Values, 2);
+    $this->query('UPDATE `'.$this->Prefix.$Table.'` SET '.$Values.' WHERE ('.$Condition.')');
   }
-  
+
   function replace($Table, $Data)
   {
@@ -72 +75 @@
     $Values = substr($Values, 1);
     //echo('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES ('.$Values.')<br>');
-    $this->LastQuery = 'REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')';
-    $this->query($this->LastQuery);
-    //echo($this->error().'<br>');
+    $this->query('REPLACE INTO `'.$this->Prefix.$Table.'` ('.$Name.') VALUES('.$Values.')');
   }
-  
+
   function charset($Charset)
   {
-    $this->LastQuery = 'SET CHARACTER SET '.$Charset;
-    $this->query($this->LastQuery);
+    $this->query('SET CHARACTER SET '.$Charset);
   }
 

forms.php

@@ -28 +28 @@
   function ShowEditBlock($Context = '')
   {
-    global $Database, $Types;
+    global $Database, $Types, $TypeNames;
 
     $Table = array(
@@ -37 +37 @@
     foreach($this->Definition['Items'] as $Item)
     {
-      if($Item['Type'] != 'Hidden')
+      if($Item['Type'] != $TypeNames['Hidden'])
       {
         if(!array_key_exists($Index, $this->Values) and isset($Item['Value'])) $this->Values[$Index] = $Item['Value'];
@@ -49 +49 @@
   function ShowHiddenBlock($Context = '')
   {
-    global $Database, $Types;
+    global $Database, $Types, $TypeNames;
 
     $Output = '';
@@ -55 +55 @@
     foreach($this->Definition['Items'] as $Item)
     {
-      if($Item['Type'] == 'Hidden')
+      if($Item['Type'] == $TypeNames['Hidden'])
       {
         if(!array_key_exists($Item['Name'], $this->Values) and isset($Item['Value'])) $this->Values[$Item['Name']] = $Item['Value'];

global.php

@@ -12 +12 @@
 $Database->Prefix = $Config['Database']['Prefix'];
 $Database->charset($Config['Database']['Charset']);
+$Database->ShowError = TRUE;
 include_once('module.php');
 include_once('page.php');
 include_once('forms.php');
+include_once('types/include.php');
+include_once('lists/include.php');
 include_once('base.php');
 
@@ -39 +42 @@
 $System = new System();
 $System->Config = $Config;
+include_once('database_list.php');
+$System->AddModule(new DatabaseList());
 include_once('log.php');
 $System->AddModule(new Log());

lists/SystemListItem.php

@@ -5 +5 @@
   global $Database;
 
-  print_r($Parameters);
+  //print_r($Parameters);
   $DbResult = $Database->select('SystemType', 'DbDataType', 'Id='.$Parameters['Type']);
   //echo($Database->LastQuery);
   $DbRow = $DbResult->fetch_assoc();
   $DbResult = $Database->select('SystemList', 'TableName', 'Id='.$Parameters[$Parameters['Column']]);
-  echo($Database->LastQuery);
+  //echo($Database->LastQuery);
   $DbRow2 = $DbResult->fetch_assoc();
   $Database->query('ALTER TABLE `'.$DbRow2['TableName'].'` ADD `'.$Parameters['Name'].'` '.$DbRow['DbDataType'].' NOT NULL ;');
-  echo($Database->LastQuery);
+  //echo($Database->LastQuery);
 }
 

log.php

@@ -1 +1 @@
 <?php
+
+$LogActionType = array('Add' => 0, 'Edit' => 1, 'Delete' => 2);
 
 class Log extends Module
 {
-  var $Dependencies = array('User');
+  var $Dependencies = array('User', 'DatabaseList');
+  var $TableName = 'SystemLog';
 
-  function NewRecord($Module, $Operation, $Value = '')
+  function Add($List, $Item, $Action)
   {
-    $this->Database->insert('is`.`Log', array('Time' => 'NOW()', 'User' => $this->System->Modules['User']->User['Id'], 'Module' => $Module, 'Operation' => $Operation, 'Value' => $Value));
-    //echo($this->Database->LastQuery);
+    $Values = array('User' => $this->System->Modules['User']->User['Id'], 'List' => $List, 'Item' => $Item, 'Action' => $Action);
+    $this->System->Modules['DatabaseList']->AddItem($this->TableName, $Values);
   }