Changeset 71 for trunk/www/Base

Timestamp:

Aug 23, 2009, 6:14:01 PM (15 years ago)

Author:

george

Message:

• Upraveno: Znovu zprovozněny třídy HomePage, Server a User.

Location:

trunk/www/Base

Files:

• Form.php (modified) (9 diffs)
• Html.php (modified) (1 diff)
• Table.php (modified) (1 diff)
• Types/Base.php (modified) (1 diff)
• Types/Include.php (modified) (2 diffs)
• Types/PointerOneToOne.php (modified) (3 diffs)

trunk/www/Base/Form.php

@@ -1 +1 @@
 <?php
 
-class Form
+class Form extends Module
 {
   var $Definition = array();
@@ -7 +7 @@
   var $OnSubmit = '';
   
-  function __construct($FormClass)
+  function __construct($System, $FormClass)
   {  
     $this->Definition = $FormClass;
@@ -14 +14 @@
       $this->Values[$Index] = '';
     }    
+    $this->System = $System;
+    $this->Database = $System->Database;
+    $this->Config = $System->Config;
   }
 
@@ -24 +27 @@
   function ShowTableBlock($Context = '')
   {
-    global $Database, $FormTypes;
+    global $FormTypes;
 
     $Table = array(
@@ -41 +44 @@
       }
     }
-    $Output = '<div style="text-align: center">'.$this->Definition['Title'].'</div>'.Table($Table, 'WideTable');
+    $Html = new Html();
+    $Output = '<div style="text-align: center">'.$this->Definition['Title'].'</div>'.$Html->Table($Table, 'WideTable');
     return($Output); 
   }
@@ -54 +58 @@
   function ShowEditBlock($Context = '')
   {
-    global $Database, $FormTypes;
+    global $FormTypes;
 
     $Table = array(
@@ -70 +74 @@
       }
     }
-    $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.Table($Table, 'BasicTable').
+    $Html = new Html();
+    $Output = '<fieldset><legend>'.$this->Definition['Title'].'</legend>'.$Html->Table($Table, 'BasicTable').
     '</fieldset>';
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -79 +84 @@
   function LoadValuesFromDatabase($Id)
   {
-    global $Database;
-
-    $DbResult = $Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
+    $DbResult = $this->Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
     if($DbResult->num_rows > 0) $DbRow = $DbResult->fetch_assoc();
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -94 +97 @@
   function SaveValuesToDatabase($Id)
   {
-    global $Database;
-
     if($Id == 0)
     {
       $this->Values['Id'] = $Id;
-      $DbResult = $Database->replace($this->Definition['Table'], $this->Values);
+      $DbResult = $this->Database->replace($this->Definition['Table'], $this->Values);
     } else
-    $DbResult = $Database->update($this->Definition['Table'], 'Id='.$Id, $this->Values);
+    $DbResult = $this->Database->update($this->Definition['Table'], 'Id='.$Id, $this->Values);
   }
 

trunk/www/Base/Html.php

@@ -1 +1 @@
 <?php
 
-class HTML extends Module
+class HTML
 {
   function ShowArray($Value)

trunk/www/Base/Table.php

@@ -57 +57 @@
       'Rows' => $this->Values,
     );
-    $Output = Table($Table, 'WideTable');
-    $Output .= '<div class="Pager">'.PageList('Page', $this->Page, $this->TotalRowCount, $Config['Web']['TableRowPerPage']).'</div>';
+    $Html = new Html();
+    $Output = $Html->Table($Table, 'WideTable');
+    $Output .= '<div class="Pager">'.$Html->PageList('Page', $this->Page, $this->TotalRowCount, $Config['Web']['TableRowPerPage']).'</div>';
     return($Output);
   }  

trunk/www/Base/Types/Base.php

@@ -1 +1 @@
 <?php
 
-class TypeBase
+class TypeBase extends Module
 {
   var $DatabaseCompareOperators = array();

trunk/www/Base/Types/Include.php

@@ -42 +42 @@
 function ExecuteTypeEvent($TypeName, $Event, $Parameters = array())
 {
-  global $TypeDefinitionList;
+  global $TypeDefinitionList, $System;
   
   if(array_key_exists($TypeName, $TypeDefinitionList))
@@ -48 +48 @@
     $Type = $TypeDefinitionList[$TypeName];
     $TypeClass = 'Type'.$Type['Class'];
-    $TypeObject = new $TypeClass;
+    $TypeObject = new $TypeClass($System);
     if(is_callable(array($TypeObject, $Event))) return($TypeObject->$Event($Parameters));
       else return($TypeName.'->'.$Event.'('.serialize($Parameters).')');

trunk/www/Base/Types/PointerOneToOne.php

@@ -5 +5 @@
   function OnView($Item)
   {
-    global $Database, $TypeDefinitionList;
+    global $TypeDefinitionList;
 
     $Type = $TypeDefinitionList[$Item['Type']];
-    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name FROM `'.$Type['Parameters']['Table'].'` WHERE `'.$Type['Parameters']['Id'].'`='.$Item['Value']);
     $DbRow = $DbResult->fetch_assoc();
     $Output = $DbRow['Name'];
@@ -24 +24 @@
   function OnEdit($Item)
   {
-    global $Database, $TypeDefinitionList;
+    global $TypeDefinitionList;
 
     $Output = '<select name="'.$Item['Name'].'">';
@@ -30 +30 @@
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
       else $Where = '';
-    $DbResult = $Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS Name,'.$Type['Parameters']['Id'].' AS Id FROM `'.$Type['Parameters']['Table'].'`'.$Where.' ORDER BY Name DESC');
     while($DbRow = $DbResult->fetch_assoc())
     {