Introduced PasswordField.class.php to keep things simple.

[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 ab59beb..868a3b3 100644 (file)
--- a/WEB-INF/lib/form/Form.class.php
+++ b/WEB-INF/lib/form/Form.class.php
@@ -62,6 +62,12 @@ class Form {
         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?
@@ -141,9 +147,8 @@ 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($arguments["render"])) $el->setRenderable($arguments["render"]);
-                       if (isset($arguments["enable"])) $el->setEnable($arguments["enable"]);
+                       if (isset($GLOBALS["I18N"])) $el->localize($GLOBALS["I18N"]);
+                       if (isset($arguments["enable"])) $el->setEnabled($arguments["enable"]);
                        
                        if (isset($arguments["style"])) $el->setStyle($arguments["style"]);
                        if (isset($arguments["size"])) $el->setSize($arguments["size"]);
@@ -160,10 +165,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;
                }
        }
        
@@ -189,7 +194,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>";