Changeset 33

Timestamp:

Mar 12, 2009, 6:01:58 PM (16 years ago)

Author:

george

Message:

• Přidáno: Vlastní obsluha chyb.
• Přidáno: Import dat z databáze centrály.
• Opraveno: Řazení řádků v tabulkách při přepínání stránek.

Files:

• base.php (modified) (8 diffs)
• config.sample.php (modified) (1 diff)
• custom (added)
• custom/import_centrala.php (added)
• database.php (modified) (2 diffs)
• error.php (added)
• global.php (modified) (1 diff)

base.php

@@ -11 +11 @@
   global $Database, $Config;
   
-  echo($Column.','.$ColumnValue.' ');
+  //echo($Column.','.$ColumnValue.' ');
 
   if(!CheckPermission('Read', $List['Id']))
@@ -25 +25 @@
   {
     if(($Item['VisibleInList'] == 1) and ($Item['Name'] != $Column))
-      $Output .= '<th><a href="?OrderColumn='.$Item['Name'].'">'.$Item['TextBefore'].'</a></th>';
+      $Output .= '<th><a href="?OrderColumn='.$Item['Name'].'&amp;OrderDirection='.(($_SESSION['OrderDirection'] + 1) % 2).'">'.$Item['TextBefore'].'</a></th>';
   }
   $Output .= '<th>Akce</th></tr>';
@@ -46 +46 @@
   if(array_key_exists('OrderColumn', $_GET))
   {
-    if($_SESSION['OrderColumn'] == $_GET['OrderColumn']) // Same column => reverse order
-      $_SESSION['OrderDirection'] = ($_SESSION['OrderDirection'] + 1) % 2;
     if($_SESSION['OrderTable'] != $List['Id']) // Different table => set ascending order
       $_SESSION['OrderDirection'] = 0;
     $_SESSION['OrderColumn'] = $_GET['OrderColumn'];
     $_SESSION['OrderTable'] = $List['Id'];
-  }
+    $_SESSION['OrderDirection'] = $_GET['OrderDirection'];
+  }
+  //echo(';'.$_SESSION['OrderTable'].','.$_SESSION['OrderColumn']);
   if(array_key_exists('OrderColumn', $_SESSION) and ($_SESSION['OrderTable'] == $List['Id']))
   {
@@ -58 +58 @@
     $Order = 'ORDER BY `'.$_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))';
@@ -558 +557 @@
   if(!array_key_exists($Id, $Lists))
   {
-    $DbResult = $Database->query('SELECT * FROM `SystemList` WHERE Id='.$Id);
+    $DbResult = $Database->query('SELECT * FROM `SystemList` WHERE `Id`='.$Id);
     if($DbResult->num_rows > 0)
     {
       $DbRow = $DbResult->fetch_assoc();
       $Items = array();
-      $DbResult2 = $Database->query('SELECT * FROM `SystemListItem` WHERE List='.$DbRow['Id']);
+      $DbResult2 = $Database->query('SELECT * FROM `SystemListItem` WHERE `List`='.$DbRow['Id'].' ORDER BY `Sequence`');
       while($DbRow2 = $DbResult2->fetch_assoc())
       {
@@ -569 +568 @@
       }
       $List = array(
-       'Id' => $DbRow['Id'],
-       'TableName' => $DbRow['TableName'],
-       'Database' => $DbRow['Database'],
-       'Title' => $DbRow['Title'],
-       'IdName' => $DbRow['IdName'],
-       'Items' => $Items,
+        'Id' => $DbRow['Id'],
+        'TableName' => $DbRow['TableName'],
+        'Database' => $DbRow['Database'],
+        'Title' => $DbRow['Title'],
+        'IdName' => $DbRow['IdName'],
+        'Items' => $Items,
       );
       //if(!array_key_exists($List['ItemId'], $TypeDefinitionList))
@@ -594 +593 @@
   if(!array_key_exists($Id, $Types))
   {
-    $DbResult = $Database->query('SELECT * FROM `SystemType` WHERE Id='.$Id);
+    $DbResult = $Database->query('SELECT * FROM `SystemType` WHERE `Id`='.$Id);
     if($DbResult->num_rows > 0)
     {
@@ -601 +600 @@
       if(($DbRow['ParentType'] == TypePointerOneToOneId) or ($DbRow['ParentType'] == TypePointerOneToManyId))
       {
-        $DbResult2 = $Database->query('SELECT * FROM `SystemList` WHERE TableName="'.$DbRow['Parameters'][0].'"');
+        $DbResult2 = $Database->query('SELECT * FROM `SystemList` WHERE `TableName`="'.$DbRow['Parameters'][0].'"');
         $DbRow2 = $DbResult2->fetch_assoc();
         //echo($DbRow['ParentType'].'-'.$DbRow['Parameters'][0].'='.$DbRow2['ItemId'].'<br>');

config.sample.php

@@ -22 +22 @@
     'AdminEmail' => 'admin@localhost',
     'ItemsPerPage' => 20,
+        'ShowSQLQuery' => true,
         'ShowSQLError' => true,
         'ShowPHPError' => true,

database.php

@@ -8 +8 @@
   var $Prefix = '';
   var $LastQuery = '';
-  var $ShowError = 0;
 
   function query($Query)
   {
-    $this->LastQuery = $Query;
+    global $Config;
+
+        if($Config['Web']['ShowSQLQuery'] == true) 
+          echo('<div style="border-bottom-width: 1px; border-bottom-style: solid; border-bottom-color: silver; padding-bottom: 2px; padding-top: 2px; font-size: 12px; font-family: Arial;">'.$Query.'</div>');
+        $this->LastQuery = $Query;
     $DbResult = parent::query($Query);
-    if(($this->ShowError == TRUE) and ($this->error != ''))
+    if(($this->error != '') and ($Config['Web']['ShowSQLError'] == true)) 
     {
       echo('<strong>Database error:</strong> '.$this->error.'<br />');
@@ -70 +73 @@
       $Value = strtr($Value, '"', '\"');
       if($Value != 'NOW()') $Value = "'".$Value."'";
-      $Values .= ", ".$Key."=".$Value;
+      $Values .= ", `".$Key."`=".$Value;
     }
     $Values = substr($Values, 2);

global.php

@@ -5 +5 @@
 foreach($_GET as $Index => $Item) $_GET[$Index] = addslashes($Item);
 
-session_start();
+if(!isset($SessionDisable)) session_start();
 include('config.php');
+include('error.php');
 include('database.php');
-include_once('code.php');
+include('code.php');
 $Database = new Database($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
 $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');
+include('module.php');
+include('page.php');
+include('forms.php');
+include('types/include.php');
+include('lists/include.php');
+include('base.php');
 
 class System extends Module