X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=WEB-INF%2Flib%2Fform%2FCheckbox.class.php;h=c4acbc5f51ee0aeaa011cd54ff39d1a474ca92d4;hb=75a1eedb8977b8f2db459128bab9aaf367e3b58b;hp=4c6a9fd77468a873750ab5c49177502ec17d121e;hpb=61efd9d023ae34c1290ef2e1ae25829c509caaee;p=timetracker.git

diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php
index 4c6a9fd7..c4acbc5f 100644
--- a/WEB-INF/lib/form/Checkbox.class.php
+++ b/WEB-INF/lib/form/Checkbox.class.php
@@ -29,28 +29,20 @@
 import('form.FormElement');
 
 class Checkbox extends FormElement {
-    var $mChecked	= false;
-    var $mOptions	= null;
-    var $class = 'Checkbox';
 
-	function __construct($name,$value="")
-	{
-		$this->name = $name;
-		$this->value = $value;
-	}
+  function __construct($name) {
+    $this->class = 'Checkbox';
+    $this->name = $name;
+  }
+
+  function getHtml() {
+    if ($this->id == '') $this->id = $this->name;
 
-	function setChecked($value)	{ $this->mChecked = $value; }
-	function isChecked() { return $this->mChecked; }
-	
-	function setData($value)	{ $this->mOptions = $value; }
-	function getData() { return $this->mOptions; }
-	
-	function getHtml() {
+    $html = "\n\t<input type=\"checkbox\"";
+    $html.= " id=\"$this->id\" name=\"$this->name\"";
 
-	    if ($this->id=="") $this->id = $this->name;
-	    
-		$html = "\n\t<input type=\"checkbox\"";
-		$html .= " name=\"$this->name\" id=\"$this->id\"";
+    if ($this->value)
+      $html.= " checked=\"true\"";
 
 		if ($this->on_change!="")
 		   $html .= " onchange=\"$this->on_change\"";
@@ -58,13 +50,14 @@ class Checkbox extends FormElement {
 		if ($this->style!="")
 		   $html .= " style=\"$this->style\"";
 
-		if ($this->mChecked || (($this->value == $this->mOptions) && ($this->value != null)))
-		   $html .= " checked=\"true\"";
+
 		   
 		if (!$this->isEnabled())
 		   $html .= " disabled=\"disabled\"";
-		   
-		$html .= " value=\"".htmlspecialchars($this->mOptions)."\"";
+
+      // Provide a value so that we pass "1" for set checkboxes on form submit.
+      // Otherwise the default is "on" string, which is not what we want.
+      $html .= " value=\"1\"";
 		
 		$html .= "/>\n";