- Frontend improvements (Eugene)

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

3 files changed, 15 insertions, 5 deletions

diff --git a/frontends/php/include/classes/cformtable.inc.php b/frontends/php/include/classes/cformtable.inc.php
index 3af7acae..1adb45d0 100644
--- a/frontends/php/include/classes/cformtable.inc.php
+++ b/frontends/php/include/classes/cformtable.inc.php
@@ -39,11 +39,21 @@
 			$this->SetAlign('center');
 			$this->SetHelp();
 
+			$this->AddItemToTopRow("<a name=\"form\"></a>");
+			
 			$this->AddVar("form","1");
 
 			$this->bottom_items = new CCol(NULL,'form_row_last');
 		        $this->bottom_items->SetColSpan(2);
 		}
+		function SetAction($value)
+		{
+			if(!is_string($value))
+			{
+				return $this->error("Incorrect value for SetAlign [$value]");
+			}
+			parent::SetAction($value."#form");
+		}
 		function SetAlign($value)
 		{
 			if(!is_string($value))
diff --git a/frontends/php/include/classes/cimg.inc.php b/frontends/php/include/classes/cimg.inc.php
index 48a102c0..11503faf 100644
--- a/frontends/php/include/classes/cimg.inc.php
+++ b/frontends/php/include/classes/cimg.inc.php
@@ -37,7 +37,7 @@
 			{
 				return $this->error("Incorrect value for SetSrc [$value]");
 			}
-			return $this->AddOption("src",$value);
+			return $this->AddOption("src",htmlspecialchars($value));
 		}
 		function SetAltText($value=NULL)
 		{
diff --git a/frontends/php/include/classes/ctable.inc.php b/frontends/php/include/classes/ctable.inc.php
index bcb1998d..300d53b8 100644
--- a/frontends/php/include/classes/ctable.inc.php
+++ b/frontends/php/include/classes/ctable.inc.php
@@ -38,7 +38,7 @@
 		}
 		function SetRowSpan($value)
 		{
-			if(!is_int($value))
+			if(!is_int($value) && !is_numeric($value))
 			{
 				return $this->error("Incorrect value for SetRowSpan [$value]"); 
 				return 1;
@@ -47,7 +47,7 @@
 		}
 		function SetColSpan($value)
 		{
-			if(!is_int($value))
+			if(!is_int($value) && !is_numeric($value))
 			{
 				return $this->error("Incorrect value for SetColSpan[$value]"); 
 			}
@@ -174,7 +174,7 @@
 		}
 		function SetCellPadding($value)
 		{
-			if(!is_int($value))
+			if(!is_int($value) && !is_numeric($value))
 			{
 				return $this->error("Incorrect value for SetCellpadding [$value]"); 
 			}
@@ -182,7 +182,7 @@
 		}
 		function SetCellSpacing($value)
 		{
-			if(!is_int($value))
+			if(!is_int($value) && !is_numeric($value))
 			{
 				return $this->error("Incorrect value for SetCellSpacing [$value]"); 
 			}