Changeset 93 for trunk/www/Base/Form.php

Timestamp:

Aug 15, 2013, 11:17:26 PM (11 years ago)

Author:

chronos

Message:

• Fixed: System variable as parameter to constructors of descendents of Module class.
• Removed: End PHP mark "?>" from all files.

File:

• trunk/www/Base/Form.php (modified) (7 diffs)

trunk/www/Base/Form.php

@@ -13 +13 @@
   function __construct($System, $FormClass)
   {  
+        parent::__construct($System);
     $this->Definition = $FormClass;
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -18 +19 @@
       $this->Values[$Index] = '';
     }    
-    $this->System = $System;
-    $this->Database = $System->Database;
-    $this->Config = $System->Config;
   }
 
@@ -43 +41 @@
       {
         if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
-        $Edit = ExecuteTypeEvent($Item['Type'], 'OnView', 
+        $Edit = ExecuteTypeEvent($this->System, $Item['Type'], 'OnView', 
           array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
         array_push($Table['Rows'], array($Item['Caption'], $Edit));
@@ -74 +72 @@
       {
         if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
-        $Edit = ExecuteTypeEvent($Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
+        $Edit = ExecuteTypeEvent($this->System, $Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
         array_push($Table['Rows'], array($Item['Caption'].':', $Edit));
       }
@@ -82 +80 @@
     '</fieldset>';
     foreach($this->Definition['Items'] as $Index => $Item)
-      if($Item['Type'] == 'Hidden') $Output .= ExecuteTypeEvent($Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
+      if($Item['Type'] == 'Hidden') $Output .= ExecuteTypeEvent($this->System, $Item['Type'], 'OnEdit', array('Name' => $Index, 'Value' => $this->Values[$Index], 'Type' => $Item['Type']));
     return($Output); 
   }
@@ -123 +121 @@
     {
       if(array_key_exists($Context.$Index, $_POST))
-      $Values[$Index] = ExecuteTypeEvent($Item['Type'], 'OnLoad', 
+      $Values[$Index] = ExecuteTypeEvent($this->System, $Item['Type'], 'OnLoad', 
         array('Name' => $Index, 'Type' => $Item['Type']));
     }
@@ -129 +127 @@
   }
 }
-
-?>