X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FForm.class.php;h=19dd0111f5cb75b308819daeb0703f6c1c939640;hb=75a1eedb8977b8f2db459128bab9aaf367e3b58b;hp=e871743d0bb1e1af5141c3d07db317702d5a9538;hpb=4fdb2cd8b1c8990a7ea8ed40b275dc51174e6585;p=timetracker.git

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index e871743d..19dd0111 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -77,20 +77,25 @@ class Form {
       case 'textarea':
         import('form.TextArea');
         $el = new TextArea($params['name']);
-        if (isset($params['cols'])) $el->setColumns($params['cols']);
-        if (isset($params['rows'])) $el->setRows($params['rows']);
         if (isset($params['maxlength'])) $el->setMaxLength($params['maxlength']);
         break;
 
       case 'checkbox':
         import('form.Checkbox');
         $el = new Checkbox($params['name']);
-        if (isset($params['checked'])) $el->setChecked($params['checked']);
+        break;
+
+      case 'hidden':
+        import('form.Hidden');
+        $el = new Hidden($params['name']);
+        break;
+
+      case 'submit':
+        import('form.Submit');
+        $el = new Submit($params['name']);
+        break;
 
 // TODO: refactoring ongoing down from here.
-			    $el->setData(@$params["data"]);
-			    break;
-			    
 			case "checkboxgroup":
 			    import('form.CheckboxGroup');
 			    $el = new CheckboxGroup($params["name"]);
@@ -105,19 +110,13 @@ class Form {
 			    $el = new Combobox($params["name"]);
 			    $el->setData(@$params["data"]);
 			    $el->setDataDefault(@$params["empty"]);
+                            if (isset($params["multiple"])) {
+                              $el->setMultiple($params["multiple"]);
+                              $el->name .= '[]'; // Add brackets to the end of name to get back an array on POST.
+                            }
 			    if (isset($params["datakeys"])) $el->setDataKeys($params["datakeys"]);
 			    break;
-			    
-			case "hidden":
-			    import('form.Hidden');
-			    $el = new Hidden($params["name"]);
-			    break;
-			 
-			case "submit":
-			    import('form.Submit');
-			    $el = new Submit($params["name"]);
-			    break;
-			    
+
 			case "calendar":
 			    import('form.Calendar');
 			    $el = new Calendar($params["name"]);
@@ -140,7 +139,7 @@ class Form {
 		if ($el!=null) {
 			$el->setFormName($this->name);
 			if (isset($params["id"])) $el->setId($params["id"]);
-			if (isset($GLOBALS["I18N"])) $el->localize($GLOBALS["I18N"]);
+			$el->localize();
 			if (isset($params["enable"])) $el->setEnabled($params["enable"]);
 			
 			if (isset($params["style"])) $el->setStyle($params["style"]);
@@ -158,7 +157,7 @@ class Form {
 	
 	function addInputElement(&$el) {
 		if ($el && is_object($el)) {
-			if (isset($GLOBALS["I18N"])) $el->localize($GLOBALS["I18N"]);
+			$el->localize();
 		
 			$el->setFormName($this->name);
 			$this->elements[$el->name] = &$el;