- [DEV-192] added filter to Status of triggers (Artem)

 - [DEV-191] monitoring screens inline update preparation (Artem)
 - [DEV-192] added severity filter in status of triggers (Artem)
 - [DEV-137] sql fixes for oracle (Artem)
 - [ZBX-396] fixed error maps message (Artem)
 - [ZBX-394] fixed showing hosts without group in status of triggers (Artem)
 - [DEV-137] small fixes (Artem)

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

1 files changed, 19 insertions, 22 deletions

diff --git a/frontends/php/include/classes/cimg.inc.php b/frontends/php/include/classes/cimg.inc.php
index 488c7b91..d26adf3f 100644
--- a/frontends/php/include/classes/cimg.inc.php
+++ b/frontends/php/include/classes/cimg.inc.php
@@ -19,11 +19,9 @@
 **/
 ?>
 <?php
-	class CImg extends CTag
-	{
+	class CImg extends CTag{
 /* public */
-		function CImg($src,$name=NULL,$width=NULL,$height=NULL,$class=NULL)
-		{
+		function CImg($src,$name=NULL,$width=NULL,$height=NULL,$class=NULL){
 			parent::CTag("img","no");
 
 			$this->tag_start= "";
@@ -43,47 +41,46 @@
 			$this->SetHeight($height);
 			$this->SetClass($class);
 		}
-		function SetSrc($value)
-		{
-			if(!is_string($value))
-			{
+		
+		function SetSrc($value){
+			if(!is_string($value)){
 				return $this->error("Incorrect value for SetSrc [$value]");
 			}
-			return $this->AddOption("src",$value);
+		return $this->AddOption("src",$value);
 		}
-		function SetAltText($value=NULL)
-		{
-			if(!is_string($value))
-			{
+		
+		function SetAltText($value=NULL){
+			if(!is_string($value)){
 				return $this->error("Incorrect value for SetText [$value]");
 			}
-			return $this->AddOption("alt",$value);
+		return $this->AddOption("alt",$value);
 		}
-		function SetMap($value=NULL)
-		{
+		
+		function SetMap($value=NULL){
 			if(is_null($value))
-				$this->DeleteOption("usemup");
+				$this->DeleteOption("usemap");
 
-			if(!is_string($value))
-			{
+			if(!is_string($value)){
 				return $this->error("Incorrect value for SetMap [$value]");
 			}
 			
 			$value = '#'.ltrim($value,'#');
-			return $this->AddOption("usemap",$value);
+		return $this->AddOption("usemap",$value);
 		}
+		
 		function SetWidth($value=NULL){
 			if(is_null($value))
 				return $this->DelOption("width");
-			elseif(is_numeric($value)||is_int($value))
+			else if(is_numeric($value)||is_int($value))
 				return $this->AddOption("width",$value);
 			else
 				return $this->error("Incorrect value for SetWidth [$value]");
 		}
+		
 		function SetHeight($value=NULL){
 			if(is_null($value))
 				return $this->DelOption("height");
-			elseif(is_numeric($value)||is_int($value))
+			else if(is_numeric($value)||is_int($value))
 				return $this->AddOption("height",$value);
 			else
 				return $this->error("Incorrect value for SetHeight [$value]");