- fixed dependency groupid->hostid->graphid in charts screen (Artem)

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

3 files changed, 10 insertions, 8 deletions

diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 20b733f3..c2ed7eca 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -650,12 +650,14 @@ function make_latest_issues($available_hosts=false){
 				$actions->AddRow(array($tdl,$tdc,$tdr));
 			}
 //--------			
-		
+			$clock = new CLink(zbx_date2str(S_DATE_FORMAT_YMDHMS,$row_event['clock']),"events.php?triggerid=".$row["triggerid"].'&source=0',"action");
+			$clock->SetTarget('_blank');
+			
 			$table->AddRow(array(
 				get_node_name_by_elid($row['triggerid']),
 				$host,
 				new CCol($description,get_severity_style($row["priority"])),
-				new CLink(zbx_date2str(S_DATE_FORMAT_YMDHMS,$row_event['clock']),"events.php?triggerid=".$row["triggerid"],"action"),					
+				$clock,
 				zbx_date2age($row_event['clock']),
 				($config['event_ack_enable'])?(new CCol($ack,"center")):NULL,
 				$actions
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index 1bde9468..c65c29f0 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -426,9 +426,11 @@ COpt::profiling_start("page");
 		foreach($page['scripts'] as $id => $script){
 			if(file_exists('js/'.$script)){
 				echo '    <script type="text/javascript" src="js/'.$script.'"></script>'."\n";
-			} elseif(file_exists($script)){
+			} 
+			else if(file_exists($script)){
 				echo '    <script type="text/javascript" src="'.$script.'"></script>'."\n";
-			} else {
+			} 
+			else {
 				echo '<!-- js script "'.$script.'" not found-->'."\n";
 			}
 		}
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index b72b3bc8..e448e0f7 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -1232,8 +1232,7 @@
 							' AND object='.EVENT_OBJECT_TRIGGER.
 						' ORDER BY clock desc',1);
 		$last_value = DBfetch($result);
-		if($last_value)
-		{
+		if($last_value){
 			if($value == $last_value['value'])
 				return false;
 		}
@@ -1248,8 +1247,7 @@
 	return true;
 	}
 
-	function	add_trigger_dependency($triggerid,$depid)
-	{
+	function add_trigger_dependency($triggerid,$depid){
 		$result=insert_dependency($triggerid,$depid);;
 		if(!$result)
 		{