X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FForm.class.php;h=1f77414b1febb7b4c27526d959830469553df096;hb=920b5bff2bf2fb1caa10715ed8d40175e4798019;hp=a67c0c370c445e0ff9c6a3820a3abfac2670be6d;hpb=741660d57d2e740b472c10a9763d535a74cff09c;p=timetracker.git

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index a67c0c37..1f77414b 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -77,8 +77,6 @@ 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;
 
@@ -97,6 +95,12 @@ class Form {
         $el = new Submit($params['name']);
         break;
 
+      case 'upload':
+        import('form.UploadFile');
+        $el = new UploadFile($params['name']);
+        if (isset($params['maxsize'])) $el->setMaxSize($params['maxsize']);
+        break;
+
 // TODO: refactoring ongoing down from here.
 			case "checkboxgroup":
 			    import('form.CheckboxGroup');
@@ -112,6 +116,10 @@ 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;
 
@@ -127,17 +135,11 @@ class Form {
 			    $el->setData(@$params["data"]);
 			    $el->setWidth(@$params["width"]);
 			    break;
-			    
-			case "upload":
-			    import('form.UploadFile');
-			    $el = new UploadFile($params["name"]);
-			    if (isset($params["maxsize"])) $el->setMaxSize($params["maxsize"]);
-			    break;
 		}
 		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"]);
@@ -155,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;