X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/4f4df95a604a5c11fe7ba793b18f025b13ef1fb6..199277a2fd7258bb60c37a291d0d62e04e9c31ca:/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 a45b55a3..b37903cd 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -36,25 +36,20 @@
 class Form {
 
   var $name = '';
-  // TODO: refactoring ongoing down from here.
+  var $elements = array();
 
-	var $mElements = array();
-	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) {
-    	return $this->mElements[$name];
+    	return $this->elements[$name];
     }
     
     function &getElements() {
-    	return $this->mElements;
+    	return $this->elements;
     }
     
 	//// FORM element
@@ -65,22 +60,7 @@ class Form {
 	// onsubmit
 	// onreset
     function getName() { return $this->name; }
-    
-    function isSubmit()	{
-    	if (!isset($this->mRequest)) return false;
-        $result = false;
-	    foreach ($this->mElements 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
@@ -195,7 +175,7 @@ class Form {
 			if (isset($arguments["onchange"])) $el->setOnChange($arguments["onchange"]);
 			if (isset($arguments["onclick"])) $el->setOnClick($arguments["onclick"]);
 			
-			$this->mElements[$arguments["name"]] = &$el;
+			$this->elements[$arguments["name"]] = &$el;
 		}
 	}
 	
@@ -204,7 +184,7 @@ class Form {
 			if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
 		
 			$el->setFormName($this->name);
-			$this->mElements[$el->getName()] = &$el;
+			$this->elements[$el->getName()] = &$el;
 		}
 	}
 	
@@ -215,8 +195,8 @@ class Form {
         $html .= ' method="post"';
         
         // Add enctype for file upload forms.
-        foreach ($this->mElements as $elname=>$el) {
-            if (strtolower(get_class($this->mElements[$elname])) == 'uploadfile') {
+        foreach ($this->elements as $elname=>$el) {
+            if (strtolower(get_class($this->elements[$elname])) == 'uploadfile') {
                 $html .= ' enctype="multipart/form-data"';
                 break;
             }
@@ -228,9 +208,9 @@ class Form {
     
     function toStringCloseTag() {
     	$html = "\n";
-    	foreach ($this->mElements as $elname=>$el) {
-            if (strtolower(get_class($this->mElements[$elname]))=="hidden") {
-            	$html .= $this->mElements[$elname]->toStringControl()."\n";
+    	foreach ($this->elements as $elname=>$el) {
+            if (strtolower(get_class($this->elements[$elname]))=="hidden") {
+            	$html .= $this->elements[$elname]->toStringControl()."\n";
             }
         }
         $html .= "</form>";
@@ -242,21 +222,21 @@ class Form {
         $vars['open'] = $this->toStringOpenTag();
         $vars['close'] = $this->toStringCloseTag();
         
-        foreach ($this->mElements as $elname=>$el) {
-            if (is_object($this->mElements[$elname])) 
-                $vars[$elname] = $this->mElements[$elname]->toArray();
+        foreach ($this->elements as $elname=>$el) {
+            if (is_object($this->elements[$elname])) 
+                $vars[$elname] = $this->elements[$elname]->toArray();
         }
 //print_r($vars);
         return $vars;
     }
     
     function getValueByElement($elname) {
-    	return $this->mElements[$elname]->getValue();
+    	return $this->elements[$elname]->getValue();
     }
     
     function setValueByElement($elname, $value) {
-    	if (isset($this->mElements[$elname])) {
-    		$this->mElements[$elname]->setValue($value);
+    	if (isset($this->elements[$elname])) {
+    		$this->elements[$elname]->setValue($value);
     	}
     }
 }