4 files changed, 29 insertions, 9 deletions
diff --git a/frontends/php/include/classes/cbutton.inc.php b/frontends/php/include/classes/cbutton.inc.php
index eb6443c7..9a5801fb 100644
--- a/frontends/php/include/classes/cbutton.inc.php
+++ b/frontends/php/include/classes/cbutton.inc.php
@@ -22,7 +22,7 @@
 	class CButton extends CTag
 	{
 /* public */
-		function CButton($name="button", $caption="", $action=NULL)
+		function CButton($name="button", $caption="", $action=NULL, $accesskey=NULL)
 		{
 			parent::CTag("input","no");
 			$this->tag_body_start = "";
@@ -31,6 +31,7 @@
 			$this->SetName($name);
 			$this->SetCaption($caption);
 			$this->SetAction($action);
+			$this->SetAccessKey($accesskey);
 		}
 		function SetAction($value='submit()', $event='onClick')
 		{
@@ -52,7 +53,9 @@
 		}
 		function SetAccessKey($value='B')
 		{
-			if(!is_string($value))
+			if(is_null($value))
+				return 0;
+			elseif(!is_string($value))
 			{
 				return $this->error("Incorrect value for SetAccessKey [$value]");
 			}
diff --git a/frontends/php/include/classes/ccheckbox.inc.php b/frontends/php/include/classes/ccheckbox.inc.php
index 0da3295e..5f492dd0 100644
--- a/frontends/php/include/classes/ccheckbox.inc.php
+++ b/frontends/php/include/classes/ccheckbox.inc.php
@@ -22,13 +22,14 @@
 	class CCheckBox extends CTag
 	{
 /* public */
-		function CCheckBox($name='checkbox',$value=NULL)
+		function CCheckBox($name='checkbox',$value=NULL,$checked="no")
 		{
 			parent::CTag("input","no");
 			$this->tag_body_start = "";
 			$this->AddOption('type','checkbox');
 			$this->SetName($name);
 			$this->SetCaption($value);
+			$this->SetChecked($checked);
 		}
 		function SetName($value='checkbox')
 		{
@@ -46,5 +47,13 @@
 				return $this->AddItem(nbsp($value));
 			return $this->error("Incorrect value for SetCaption [$value]");
 		}
+		function SetChecked($value="yes")
+		{
+			if($value=="yes")
+				return $this->AddOption("checked","checked");
+			elseif($value=="no")
+				return $this->DelOption("checked");
+			return $this->error("Incorrect value for SetChacked [$value]");
+		}
 	}
 ?>
diff --git a/frontends/php/include/classes/cformtable.inc.php b/frontends/php/include/classes/cformtable.inc.php
index dbcfdb94..61139b2b 100644
--- a/frontends/php/include/classes/cformtable.inc.php
+++ b/frontends/php/include/classes/cformtable.inc.php
@@ -77,13 +77,13 @@
 		}
 		function AddVar($name, $value)
 		{
-			$this->AddTopRow(new CVar($name, $value));
+			$this->AddItemToTopRow(new CVar($name, $value));
 		}
-		function AddTopRow($value)
+		function AddItemToTopRow($value)
 		{
 			array_push($this->top_items, $value);
 		}
-		function AddRow($item1, $item2=NULL)
+		function AddRow($item1, $item2=NULL, $class=NULL)
 		{
 			if(is_string($item1))
 				$item1=nbsp($item1);
@@ -91,11 +91,18 @@
 			$row = new CRow(array(
 					new CCol($item1,'form_row_l'),
 					new CCol($item2,'form_row_r')
-					)
+					),
+					$class
 				);
 			array_push($this->center_items, $row);
 		}
-		function AddBottomRow($value)
+		function AddSpanRow($value, $class="form_row_last")
+		{
+			$col = new CCol($value,$class);
+		        $col->SetColSpan(2);
+			array_push($this->center_items,new CRow($col,$class));
+		}
+		function AddItemToBottomRow($value)
 		{
 			$this->bottom_items->AddItem($value);
 		}
diff --git a/frontends/php/include/classes/ctextbox.inc.php b/frontends/php/include/classes/ctextbox.inc.php
index 0a00de40..9777bc74 100644
--- a/frontends/php/include/classes/ctextbox.inc.php
+++ b/frontends/php/include/classes/ctextbox.inc.php
@@ -24,7 +24,7 @@
 /* private */
 		var $caption;
 /* public */
-		function CTextBox($name='textbox',$value="",$size=20,$caption=NULL)
+		function CTextBox($name='textbox',$value="",$size=20,$caption=NULL,$readonly="no")
 		{
 			parent::CTag("input","no");
 			$this->SetClass("biginput");
@@ -32,6 +32,7 @@
 			$this->SetSize($size);
 			$this->SetCaption($caption);
 			$this->SetValue($value);
+			$this->SetReadonly($readonly);
 		}
 		function Show()
 		{