Some more refactoring in Form classes.

[timetracker.git] / WEB-INF / lib / form / Checkbox.class.php

diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php
index 5ba7916513402b7c154b2d9f577ad731f30e5ba7..e3d9cf2e04f4cfc8e66aed58819b4a2c2c18a1c9 100644 (file)
--- a/WEB-INF/lib/form/Checkbox.class.php
+++ b/WEB-INF/lib/form/Checkbox.class.php
@@ -31,13 +31,12 @@ import('form.FormElement');
 class Checkbox extends FormElement {
     var $mChecked      = false;
     var $mOptions      = null;
-    var $cClassName            = "Checkbox";
 
-       function __construct($name,$value="")
-       {
-               $this->mName                    = $name;
-               $this->mValue                   = $value;
-       }
+  function __construct($name, $value = '') {
+    $this->class = 'Checkbox';
+    $this->name = $name;
+    $this->value = $value;
+  }
 
        function setChecked($value)     { $this->mChecked = $value; }
        function isChecked() { return $this->mChecked; }
@@ -45,27 +44,23 @@ class Checkbox extends FormElement {
        function setData($value)        { $this->mOptions = $value; }
        function getData() { return $this->mOptions; }
        
-       function toStringControl()      {
-               if (!$this->isRenderable()) return "";
-           
-           if ($this->mId=="") $this->mId = $this->mName;
+       function getHtml() {
+
+           if ($this->id=="") $this->id = $this->name;
            
                $html = "\n\t<input type=\"checkbox\"";
-               $html .= " name=\"$this->mName\" id=\"$this->mId\"";
-               
-               if ($this->mTabindex!="")
-                  $html .= " tabindex=\"$this->mTabindex\"";
-                  
-               if ($this->mOnChange!="")
-                  $html .= " onchange=\"$this->mOnChange\"";
+               $html .= " name=\"$this->name\" id=\"$this->id\"";
+
+               if ($this->on_change!="")
+                  $html .= " onchange=\"$this->on_change\"";
                   
-               if ($this->mStyle!="")
-                  $html .= " style=\"$this->mStyle\"";
+               if ($this->style!="")
+                  $html .= " style=\"$this->style\"";
 
-               if ($this->mChecked || (($this->mValue == $this->mOptions) && ($this->mValue != null)))
+               if ($this->mChecked || (($this->value == $this->mOptions) && ($this->value != null)))
                   $html .= " checked=\"true\"";
                   
-               if (!$this->isEnable())
+               if (!$this->isEnabled())
                   $html .= " disabled=\"disabled\"";
                   
                $html .= " value=\"".htmlspecialchars($this->mOptions)."\"";