X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FForm.class.php;h=1beb590c6d10e8fc480459db7761147652acfb48;hb=785d404c84c153bda7d45d3aedfefa81985703b3;hp=2c16f251072becd87265fce210e580d03b0bc497;hpb=04bc6bdd39d67bcf9f63d8af4b067f1fafc06f8a;p=timetracker.git

diff --git a/WEB-INF/lib/form/Form.class.php b/WEB-INF/lib/form/Form.class.php
index 2c16f251..1beb590c 100644
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -59,12 +59,16 @@ class Form {
         import('form.TextField');
         $el = new TextField($arguments['name']);
         $el->setMaxLength(@$arguments['maxlength']);
-        if (isset($arguments['aspassword'])) $el->setAsPassword($arguments['aspassword']);
+        break;
+
+      case 'password':
+        import('form.PasswordField');
+        $el = new PasswordField($arguments['name']);
+        $el->setMaxLength(@$arguments['maxlength']);
         break;
 
 // TODO: refactoring ongoing down from here.
-// aspassword - change this name to something better? Perhaps.
-// Change $arguments to something better too (maybe). $args or $params?
+// Change $arguments to something better (maybe). $args or $params?
 			case "datefield":
 			    import('form.DateField');
 			    $el = new DateField($arguments["name"]);
@@ -141,7 +145,7 @@ class Form {
 		if ($el!=null) {
 			$el->setFormName($this->name);
 			if (isset($arguments["id"])) $el->setId($arguments["id"]);
-			if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
+			if (isset($GLOBALS["I18N"])) $el->localize($GLOBALS["I18N"]);
 			if (isset($arguments["enable"])) $el->setEnabled($arguments["enable"]);
 			
 			if (isset($arguments["style"])) $el->setStyle($arguments["style"]);
@@ -159,10 +163,10 @@ class Form {
 	
 	function addInputElement(&$el) {
 		if ($el && is_object($el)) {
-			if (isset($GLOBALS["I18N"])) $el->setLocalization($GLOBALS["I18N"]);
+			if (isset($GLOBALS["I18N"])) $el->localize($GLOBALS["I18N"]);
 		
 			$el->setFormName($this->name);
-			$this->elements[$el->getName()] = &$el;
+			$this->elements[$el->name] = &$el;
 		}
 	}
 	
@@ -188,7 +192,7 @@ class Form {
     	$html = "\n";
     	foreach ($this->elements as $elname=>$el) {
             if (strtolower(get_class($this->elements[$elname]))=="hidden") {
-            	$html .= $this->elements[$elname]->toStringControl()."\n";
+                $html .= $this->elements[$elname]->getHtml()."\n";
             }
         }
         $html .= "</form>";