Resumed refactoring forms, hopefully without breaking reports this time.

[timetracker.git] / WEB-INF / lib / form / Form.class.php

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 50804dd83135cd10720a055deabf265922031e81..a45b55a31d6c8abd44ca6bedddcc08defdba4e4f 100644 (file)
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -36,9 +36,9 @@
 class Form {
 
   var $name = '';
-  var $elements = array();
   // TODO: refactoring ongoing down from here.
 
+       var $mElements = array();
        var $mRequest;
     
     function __construct($formName) {
@@ -50,11 +50,11 @@ class Form {
     }
 
     function &getElement($name) {
-        return $this->elements[$name];
+       return $this->mElements[$name];
     }
     
     function &getElements() {
-        return $this->elements;
+       return $this->mElements;
     }
     
        //// FORM element
@@ -69,7 +69,7 @@ class Form {
     function isSubmit()        {
        if (!isset($this->mRequest)) return false;
         $result = false;
-           foreach ($this->elements as $el) {
+           foreach ($this->mElements as $el) {
                if (strtolower(get_class($el))=="submit") {
                    $name = $el->getName();
                    $value = $this->mRequest->getAttribute($name);
@@ -195,16 +195,16 @@ class Form {
                        if (isset($arguments["onchange"])) $el->setOnChange($arguments["onchange"]);
                        if (isset($arguments["onclick"])) $el->setOnClick($arguments["onclick"]);
                        
-                       $this->elements[$arguments["name"]] = &$el;
+                       $this->mElements[$arguments["name"]] = &$el;
                }
        }
        
        function addInputElement(&$el) {
                if ($el && is_object($el)) {
-                        if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
-
+                       if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
+               
                        $el->setFormName($this->name);
-                       $this->elements[$el->getName()] = &$el;
+                       $this->mElements[$el->getName()] = &$el;
                }
        }
        
@@ -215,8 +215,8 @@ class Form {
         $html .= ' method="post"';
         
         // Add enctype for file upload forms.
-        foreach ($this->elements as $elname=>$el) {
-            if (strtolower(get_class($this->elements[$elname])) == 'uploadfile') {
+        foreach ($this->mElements as $elname=>$el) {
+            if (strtolower(get_class($this->mElements[$elname])) == 'uploadfile') {
                 $html .= ' enctype="multipart/form-data"';
                 break;
             }
@@ -228,9 +228,9 @@ class Form {
     
     function toStringCloseTag() {
        $html = "\n";
-        foreach ($this->elements as $elname=>$el) {
-            if (strtolower(get_class($this->elements[$elname]))=="hidden") {
-                $html .= $this->elements[$elname]->toStringControl()."\n";
+       foreach ($this->mElements as $elname=>$el) {
+            if (strtolower(get_class($this->mElements[$elname]))=="hidden") {
+               $html .= $this->mElements[$elname]->toStringControl()."\n";
             }
         }
         $html .= "</form>";
@@ -242,21 +242,21 @@ class Form {
         $vars['open'] = $this->toStringOpenTag();
         $vars['close'] = $this->toStringCloseTag();
         
-        foreach ($this->elements as $elname=>$el) {
-            if (is_object($this->elements[$elname]))
-                $vars[$elname] = $this->elements[$elname]->toArray();
+        foreach ($this->mElements as $elname=>$el) {
+            if (is_object($this->mElements[$elname])) 
+                $vars[$elname] = $this->mElements[$elname]->toArray();
         }
 //print_r($vars);
         return $vars;
     }
     
     function getValueByElement($elname) {
-        return $this->elements[$elname]->getValue();
+       return $this->mElements[$elname]->getValue();
     }
     
     function setValueByElement($elname, $value) {
-        if (isset($this->elements[$elname])) {
-            $this->elements[$elname]->setValue($value);
+       if (isset($this->mElements[$elname])) {
+               $this->mElements[$elname]->setValue($value);
        }
     }
 }