- developed group functionality for graphs (Eugene)

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

7 files changed, 15 insertions, 7 deletions

diff --git a/frontends/php/include/classes/clink.inc.php b/frontends/php/include/classes/clink.inc.php
index 8435092f..0493076c 100644
--- a/frontends/php/include/classes/clink.inc.php
+++ b/frontends/php/include/classes/clink.inc.php
@@ -44,7 +44,7 @@
 		}
 		function SetUrl($value)
 		{
-			$this->options['href'] = $value;
+			parent::AddOption('href', $value);
 		}
 		function SetTarget($value=NULL)
 		{
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index 7b37e14d..c0ac82e1 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -84,7 +84,9 @@
 		{
 			$res = $this->tag_start.'<'.$this->tagname;
 			foreach($this->options as $key => $value)
+			{
 				$res .= ' '.$key.'="'.$value.'"';
+			}
 			$res .= ($this->paired=='yes') ? '>' : '/>';
 			return $res;
 		}
diff --git a/frontends/php/include/classes/cvar.inc.php b/frontends/php/include/classes/cvar.inc.php
index 79a136b4..7a86d0bf 100644
--- a/frontends/php/include/classes/cvar.inc.php
+++ b/frontends/php/include/classes/cvar.inc.php
@@ -51,7 +51,7 @@
 		{
 			$this->var_container = array();
 
-			if(null == $value) return;
+			if(is_null($value)) return;
 
 			if(is_array($value))
 			{
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 89665dfe..6709a496 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2340,6 +2340,7 @@ COpt::profiling_stop("script");
 		{
 			if(frmForm.elements[i].type != 'checkbox') continue;
 			if(frmForm.elements[i].name == chkMain) continue;
+			if(frmForm.elements[i].disabled == true) continue;
 			frmForm.elements[i].checked = value;
 		}
 	}
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 732f5b79..0eb22249 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -1001,7 +1001,7 @@
 
 		$frmGItem->AddItemToBottomRow(new CButton("save",S_SAVE));
 		$frmGItem->AddItemToBottomRow(SPACE);
-		if(isset($itemid))
+		if(isset($_REQUEST["gitemid"]))
 		{
 			$frmGItem->AddItemToBottomRow(new CButtonDelete("Delete graph element?",
 				url_param("gitemid").url_param("graphid")));
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 6f5c00f6..88103815 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -498,7 +498,7 @@
 		$result = copy_graphitems_for_host($graphid, $new_graphid, $hostid);
 		if(!$result)
 		{
-			delete_graph($graphid);
+			delete_graph($new_graphid);
 		}
 		return $result;
 	}
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index a1345428..93e91246 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -464,7 +464,10 @@
 			if($expression[$i] == '}')
 			{
 				$state='';
-				$sql="select h.host,i.key_,f.function,f.parameter,i.itemid from items i,functions f,hosts h where functionid=$functionid and i.itemid=f.itemid and h.hostid=i.hostid";
+				$sql='select h.host,i.key_,f.function,f.parameter,i.itemid'.
+					' from items i,functions f,hosts h'.
+					' where functionid='.$functionid.' and i.itemid=f.itemid and h.hostid=i.hostid';
+
 				$res1=DBselect($sql);
 				$row1=DBfetch($res1);
 				if($html == 0)
@@ -473,15 +476,17 @@
 				}
 				else
 				{
+					$Link = new CLink($row1["host"].":".$row1["key_"]);
 					$item=get_item_by_itemid($row1["itemid"]);
 					if($item["value_type"] ==0) 
 					{
-						$exp=$exp."{<A HREF=\"history.php?action=showgraph&itemid=".$row1["itemid"]."\">".$row1["host"].":".$row1["key_"]."</A>.<B>".$row1["function"]."(</B>".$row1["parameter"]."<B>)</B>}";
+						$Link->SetUrl('history.php?action=showgraph&itemid='.$row1['itemid']);
 					}
 					else
 					{
-						$exp=$exp."{<A HREF=\"history.php?action=showvalues&period=3600&itemid=".$row1["itemid"]."\">".$row1["host"].":".$row1["key_"]."</A>.<B>".$row1["function"]."(</B>".$row1["parameter"]."<B>)</B>}";
+						$Link->SetUrl('history.php?action=showvalues&period=3600&itemid='.$row1['itemid']);
 					}
+					$exp .= $Link->ToString().'.'.bold($row1["function"].'(').$row1["parameter"].bold(')');
 				}
 				continue;
 			}