- developed frontend installation wizard (Eugene)

git-svn-id: svn://svn.zabbix.com/trunk@3434 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 25 insertions, 18 deletions

diff --git a/frontends/php/include/classes/cform.inc.php b/frontends/php/include/classes/cform.inc.php
index 9767a7f3..7af98ee8 100644
--- a/frontends/php/include/classes/cform.inc.php
+++ b/frontends/php/include/classes/cform.inc.php
@@ -41,9 +41,12 @@
 			{
 				if(isset($page['file']))
 				{
-					return $this->options['action'] = $page['file'];
+					$value = $page['file'];
+				}
+				else
+				{
+					$value = "#";
 				}
-				return 1;
 			}
 			return $this->options['action'] = $value;
 		}
diff --git a/frontends/php/include/classes/clist.inc.php b/frontends/php/include/classes/clist.inc.php
index c5eb9b57..cf5a5502 100644
--- a/frontends/php/include/classes/clist.inc.php
+++ b/frontends/php/include/classes/clist.inc.php
@@ -22,10 +22,11 @@
 	class CListItem extends CTag
 	{
 /* public */
-		function CListItem($value)
+		function CListItem($value,$class=null)
 		{
 			parent::CTag('li','yes');
 
+			$this->SetClass($class);
 			$this->AddItem($value);
 		}
 	}
@@ -40,25 +41,25 @@
 			$this->AddItem($value);
 			$this->SetClass($class);
 		}
-		function PrepareItem($value=NULL)
+		function PrepareItem($value=NULL,$class=null)
 		{
 			if(!is_null($value))
 			{
-				$value = new CListItem($value);
+				$value = new CListItem($value,$class);
 			}
 			return $value;
 		}
 		
-		function AddItem($value)
+		function AddItem($value,$class=null)
 		{
 			if(is_array($value))
 			{
 				foreach($value as $el)
-					parent::AddItem($this->PrepareItem($el));
+					parent::AddItem($this->PrepareItem($el,$class));
 			}
 			else
 			{
-				parent::AddItem($this->PrepareItem($value));
+				parent::AddItem($this->PrepareItem($value,$class));
 			}
 		}
 	}
diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php
index 10bb4d87..79ffc1d4 100644
--- a/frontends/php/include/classes/ctable.inc.php
+++ b/frontends/php/include/classes/ctable.inc.php
@@ -145,7 +145,8 @@
 			}
 			elseif(is_a($item,'crow'))
 			{
-				$item->SetClass($rowClass);
+				if(isset($rowClass))
+					$item->SetClass($rowClass);
 			}
 			else
 			{
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index 00f81eda..80020309 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -67,7 +67,7 @@
 		var $tag_end;
 
 /* public */
-		function CTag($tagname=NULL, $paired='no', $body=NULL)
+		function CTag($tagname=NULL, $paired='no', $body=NULL, $class=null)
 		{
 			if(!is_string($tagname))
 			{
@@ -87,6 +87,8 @@
 				CTag::AddItem($body);
 			}
 
+			$this->SetClass($class);
+
 		}
 		function ShowStart()	{	echo $this->StartToString();	}
 		function ShowBody()	{	echo $this->BodyToString();	}
@@ -145,6 +147,9 @@
 		{
 			if(isset($value))
 				$this->options['class'] = $value;
+			else
+				unset($this->options['class']);
+
 			return $value;
 		}
 		function DelOption($name)
@@ -161,21 +166,18 @@
 
 		function SetHint($text, $width='', $class='')
 		{
+			$text = addslashes(htmlspecialchars($text));
 			if($width != '' || $class!= '')
 			{
-				$this->AddOption(
-					'onMouseOver',
-					"show_hint_ext(this,'".$text."','".$width."','".$class."');"
-				);
+				$code = "show_hint_ext(this,event,'".$text."','".$width."','".$class."');";
 			}
 			else
 			{
-				$this->AddOption(
-					'onMouseOver',
-					"show_hint(this,'".$text."');"
-				);
+				$code = "show_hint(this,event,'".$text."');";
 			}
 
+			$this->AddOption('onMouseOver',	$code);
+			$this->AddOption('onMouseMove',	$code);
 		}
 
 		function OnClick($handle_code)