Changeset 71 for trunk/www/Base/Types

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/Types

Files:

• Base.php (modified) (1 diff)
• Include.php (modified) (2 diffs)
• PointerOneToOne.php (modified) (3 diffs)

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())
     {