X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/33399ff6a8bdfe9b989810dafe9c4dbf3cf3b685..cb8e3de960b758147b34d8323054e7de70548619:/WEB-INF/lib/form/CheckboxGroup.class.php

diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php
index 46ea284b..13f207d9 100644
--- a/WEB-INF/lib/form/CheckboxGroup.class.php
+++ b/WEB-INF/lib/form/CheckboxGroup.class.php
@@ -39,10 +39,10 @@ class CheckboxGroup extends FormElement {
     var $lSelAll	= "All";
     var $lSelNone	= "None";
 
-	function CheckboxGroup($name,$value="")
+	function __construct($name,$value="")
 	{
-		$this->mName			= $name;
-		$this->mValue			= $value;
+		$this->name = $name;
+		$this->value = $value;
 	}
 
 	function setChecked($value)	{ $this->mChecked = $value; }
@@ -69,7 +69,7 @@ class CheckboxGroup extends FormElement {
 	function toStringControl()	{
 		if (!$this->isRenderable()) return "";
 	    
-	    if ($this->mId=="") $this->mId = $this->mName;
+	    if ($this->id=="") $this->id = $this->name;
 	    
 	    $renderArray = array();
 	    $renderCols = 0;
@@ -86,14 +86,14 @@ class CheckboxGroup extends FormElement {
 						$optkey = $optval[$this->mDataKeys[0]];
 						$optval = $optval[$this->mDataKeys[1]];
 					}
-			    	$html = "<input type=\"checkbox\" name=\"$this->mName[]\" id=\"$this->mId"."_".$i."\"";
-			    	if (is_array($this->mValue)) {
-			    		foreach ($this->mValue as $value) {
-			    			if (($value == $optkey) && ($value != null))
+			    	$html = "<input type=\"checkbox\" name=\"$this->name[]\" id=\"$this->id"."_".$i."\"";
+			    	if (is_array($this->value)) {
+			    		foreach ($this->value as $element) {
+			    			if (($element == $optkey) && ($element != null))
 			    				$html .= " checked=\"true\"";
 			    		}
 			    	}
-				   	$html .= " value=\"".htmlspecialchars($optkey)."\">&nbsp;<label for=\"$this->mId"."_".$i."\">".htmlspecialchars($optval)."</label>";
+				   	$html .= " value=\"".htmlspecialchars($optkey)."\">&nbsp;<label for=\"$this->id"."_".$i."\">".htmlspecialchars($optval)."</label>";
 				   	$renderArray[$col][$row] = $html;
 				   	
 			    	$col++;			    	
@@ -114,14 +114,14 @@ class CheckboxGroup extends FormElement {
 						$optkey = $optval[$this->mDataKeys[0]];
 						$optval = $optval[$this->mDataKeys[1]];
 					}
-			    	$html = "<input type=\"checkbox\" name=\"$this->mName[]\" id=\"$this->mId"."_".$i."\"";
-			    	if (is_array($this->mValue)) {
-			    		foreach ($this->mValue as $value) {
-			    			if (($value == $optkey) && ($value != null))
+			    	$html = "<input type=\"checkbox\" name=\"$this->name[]\" id=\"$this->id"."_".$i."\"";
+			    	if (is_array($this->value)) {
+			    		foreach ($this->value as $element) {
+			    			if (($element == $optkey) && ($element != null))
 			    				$html .= " checked=\"true\"";
 			    		}
 			    	}
-				   	$html .= " value=\"".htmlspecialchars($optkey)."\">&nbsp;<label for=\"$this->mId"."_".$i."\">".htmlspecialchars($optval)."</label>";
+				   	$html .= " value=\"".htmlspecialchars($optkey)."\">&nbsp;<label for=\"$this->id"."_".$i."\">".htmlspecialchars($optval)."</label>";
 				   	$renderArray[$col][$row] = $html;
 
 				   	$row++;