Changeset 20 for base.php

Timestamp:

Oct 22, 2008, 9:31:11 AM (16 years ago)

Author:

george

Message:

• Upraveno: Redukce použité paměti změnou načítání seznamů "na přání" místo všech najednou.
• Upraveno: Použití fetch_assoc a fetch_row místo společného fetch_array,

File:

• base.php (modified) (11 diffs)

base.php

@@ -120 +120 @@
   $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();
+  $DbRow = $DbResult->fetch_row();
   $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>');
-  while($DbRow = $DbResult->fetch_array())
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $Output .= '<tr>';
@@ -155 +155 @@
   if(!CheckPermission('Write', $List['ItemId'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
   $DbResult = $Database->select($List['TableName'], '*', 'ItemId='.$Id.' ORDER BY Id DESC LIMIT 1');
-  while($DbRow = $DbResult->fetch_array())
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $DefinitionItems = array();
@@ -194 +194 @@
   if(!CheckPermission('Write', $List['ItemId'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
   $DbResult = $Database->select($List['TableName'], '*', 'ItemId='.$Id.' ORDER BY Id DESC LIMIT 1');
-  while($DbRow = $DbResult->fetch_array())
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $DefinitionItems = array();
@@ -308 +308 @@
 function ShowViewItem($List, $Id,  $Column = '', $ColumnValue = 0)
 {
-  global $Database, $Types, $Lists;
+  global $Database, $Types;
 
   if(!CheckPermission('Read', $List['ItemId'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
   $Output = '';
   $DbResult = $Database->select($List['TableName'], '*', 'ItemId='.$Id.' ORDER BY Id DESC LIMIT 1');
-  while($DbRow = $DbResult->fetch_array())
+  while($DbRow = $DbResult->fetch_assoc())
   {
     $DefinitionItems = array();
@@ -346 +346 @@
       if($Types[$Item['Type']]['BaseType'] == 'PointerOneToMany')
       {
-        $SubList = $Lists[$Types[$Item['Type']]['Parameters'][0]];
+        $SubList = GetListDefinition($Types[$Item['Type']]['Parameters'][0]);
         $Output .= ShowList($SubList, $Types[$Item['Type']]['Parameters'][1], $DbRow['ItemId'], $Item['TextBefore']).'<br /><br />';
       }
@@ -356 +356 @@
 function ShowDeleteItem($List, $Id)
 {
-  global $Database, $Lists, $System, $LogActionType;
+  global $Database, $System, $LogActionType;
 
   if(!CheckPermission('Write', $List['ItemId'])) return(SystemMessage('Řízení přístupu', 'Nemáte dostatečná oprávnění'));
@@ -362 +362 @@
   $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 />';
+  $Output .= ShowList($_SESSION['Table'], $_SESSION['Column'], $_SESSION['ColumnValue']).'<br /><br />';
   ExecuteListEvent($List['TableName'], 'OnDelete', $Id);
   return($Output);
@@ -369 +369 @@
 function ShowMenu()
 {
-  global $Lists, $Database;
+  global $Database;
 
   $Output = '';
@@ -391 +391 @@
 function Output()
 {
-  global $Lists;
-
   $PermanentVar = array('Table', 'Item', 'Column', 'ColumnValue', 'Action');
   if($_GET['Table'] != $_SESSION['Table'])
@@ -404 +402 @@
   }
   $Output = '';
-  if(array_key_exists('Table', $_SESSION) and array_key_exists($_SESSION['Table'], $Lists))
-  {
-    $List = $Lists[$_SESSION['Table']];
+  if(array_key_exists('Table', $_SESSION))
+  {
+    $List = GetListDefinition($_SESSION['Table']);
     if(array_key_exists('Action', $_SESSION))
     {
@@ -441 +439 @@
 }
 
-function LoadListDefinition()
+function GetListDefinition($Id)
 {
   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) 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.DeletionTime IS NULL) AND (t1.List='.$DbRow['ItemId'].')');
-    while($DbRow2 = $DbResult2->fetch_assoc())
-    {
-      $Items[$DbRow2['Name']] = $DbRow2;
-    }
-    $List = array(
-     'Id' => $DbRow['Id'],
-     'ItemId' => $DbRow['ItemId'],
-     'TableName' => $DbRow['TableName'],
-     'Title' => $DbRow['Title'],
-     'Items' => $Items,
-    );
-    $Lists[$List['TableName']] = $List;
-  }
+  if(!array_key_exists($Id, $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) AND (t1.DeletionTime IS NULL) AND t1.TableName="'.$Id.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $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.DeletionTime IS NULL) AND (t1.List='.$DbRow['ItemId'].')');
+      while($DbRow2 = $DbResult2->fetch_assoc())
+      {
+        $Items[$DbRow2['Name']] = $DbRow2;
+      }
+      $List = array(
+       'Id' => $DbRow['Id'],
+       'ItemId' => $DbRow['ItemId'],
+       'TableName' => $DbRow['TableName'],
+       'Title' => $DbRow['Title'],
+       'Items' => $Items,
+      );
+      $Lists[$List['TableName']] = $List;
+    } else $Lists[$List['TableName']] = NULL;
+  }
+  return($Lists[$Id]);
   //print_r($Lists);
 }