A bit more refactoring in forms to make them leaner.

[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..b37903cdd41c60a0ac7e589a6745b719c782b8ad 100644 (file)
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -37,24 +37,19 @@ class Form {
 
   var $name = '';
   var $elements = array();
 
   var $name = '';
   var $elements = array();

-  // TODO: refactoring ongoing down from here.

 
 

-       var $mRequest;
-    
-    function __construct($formName) {
-        $this->name = $formName;
-    }
-    
-    function setRequest(&$request) {
-        $this->mRequest = &$request;
-    }
+  function __construct($formName) {
+    $this->name = $formName;
+  }
+
+  // TODO: refactoring ongoing down from here.

 
     function &getElement($name) {
 
     function &getElement($name) {

-        return $this->elements[$name];
+       return $this->elements[$name];

     }
     
     function &getElements() {
     }
     
     function &getElements() {

-        return $this->elements;
+       return $this->elements;

     }
     
        //// FORM element
     }
     
        //// FORM element


@@ -65,22 +60,7 @@ class Form {
        // onsubmit
        // onreset
     function getName() { return $this->name; }
        // onsubmit
        // onreset
     function getName() { return $this->name; }

-    
-    function isSubmit()        {
-       if (!isset($this->mRequest)) return false;
-        $result = false;
-           foreach ($this->elements as $el) {
-               if (strtolower(get_class($el))=="submit") {
-                   $name = $el->getName();
-                   $value = $this->mRequest->getAttribute($name);
-                   if($value) {
-                      $result = true; 
-                   }
-               }
-           }
-        return $result;
-    }
-       
+

        //// INPUT element
        // type = TEXT | PASSWORD | CHECKBOX | RADIO | SUBMIT | RESET | FILE | HIDDEN | IMAGE | BUTTON
        // name
        //// INPUT element
        // type = TEXT | PASSWORD | CHECKBOX | RADIO | SUBMIT | RESET | FILE | HIDDEN | IMAGE | BUTTON
        // name


@@ -201,8 +181,8 @@ class Form {
        
        function addInputElement(&$el) {
                if ($el && is_object($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;
                }
                        $el->setFormName($this->name);
                        $this->elements[$el->getName()] = &$el;
                }


@@ -228,9 +208,9 @@ class Form {
     
     function toStringCloseTag() {
        $html = "\n";
     
     function toStringCloseTag() {
        $html = "\n";

-        foreach ($this->elements as $elname=>$el) {
+       foreach ($this->elements as $elname=>$el) {

             if (strtolower(get_class($this->elements[$elname]))=="hidden") {
             if (strtolower(get_class($this->elements[$elname]))=="hidden") {

-                $html .= $this->elements[$elname]->toStringControl()."\n";
+               $html .= $this->elements[$elname]->toStringControl()."\n";

             }
         }
         $html .= "</form>";
             }
         }
         $html .= "</form>";


@@ -243,7 +223,7 @@ class Form {
         $vars['close'] = $this->toStringCloseTag();
         
         foreach ($this->elements as $elname=>$el) {
         $vars['close'] = $this->toStringCloseTag();
         
         foreach ($this->elements as $elname=>$el) {

-            if (is_object($this->elements[$elname]))
+            if (is_object($this->elements[$elname])) 

                 $vars[$elname] = $this->elements[$elname]->toArray();
         }
 //print_r($vars);
                 $vars[$elname] = $this->elements[$elname]->toArray();
         }
 //print_r($vars);


@@ -251,12 +231,12 @@ class Form {
     }
     
     function getValueByElement($elname) {
     }
     
     function getValueByElement($elname) {

-        return $this->elements[$elname]->getValue();
+       return $this->elements[$elname]->getValue();

     }
     
     function setValueByElement($elname, $value) {
     }
     
     function setValueByElement($elname, $value) {

-        if (isset($this->elements[$elname])) {
-            $this->elements[$elname]->setValue($value);
+       if (isset($this->elements[$elname])) {
+               $this->elements[$elname]->setValue($value);

        }
     }
 }
        }
     }
 }