From 527da18d12fc32d48858acd51e934ef57ab294fb Mon Sep 17 00:00:00 2001
From: artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Wed, 30 Jul 2008 12:40:42 +0000
Subject:  - [DEV-191] fixes to inline update in "Latest Data" screen (Artem) 
 - [DEV-137] improvements in HTML validation (Artem)  - [DEV-137] fixes in SQL
 constructions for MySQL (Artem)

git-svn-id: svn://svn.zabbix.com/trunk@5853 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/blocks/latest.page.php             |  6 +-----
 frontends/php/exp_imp.php                        |  2 +-
 frontends/php/include/classes/cformtable.inc.php |  4 ++--
 frontends/php/include/classes/chart.inc.php      |  4 ++--
 frontends/php/include/classes/ctag.inc.php       |  2 +-
 frontends/php/include/config.inc.php             | 13 ++++++++++---
 frontends/php/include/db.inc.php                 |  3 ++-
 frontends/php/include/page_header.php            | 19 +++++++++++--------
 frontends/php/include/triggers.inc.php           |  1 -
 frontends/php/js/updater.js                      |  2 ++
 frontends/php/styles/div.css                     |  5 +++--
 frontends/php/tr_status.php                      |  2 +-
 12 files changed, 36 insertions(+), 27 deletions(-)

(limited to 'frontends/php')

diff --git a/frontends/php/blocks/latest.page.php b/frontends/php/blocks/latest.page.php
index 28ad6f16..17350330 100644
--- a/frontends/php/blocks/latest.page.php
+++ b/frontends/php/blocks/latest.page.php
@@ -58,12 +58,10 @@
 // Header
 	$r_form = new CForm();
 	$r_form->SetMethod('get');
-//	$r_form->AddOption('onsubmit',"return updater.onetime_update(this);");
+//	$r_form->AddOption('onsubmit',"return updater.onetime_update('".ZBX_PAGE_MAIN_HAT."',this.form);");
 
 	$r_form->AddVar("select",$_REQUEST["select"]);
 	
-//	$cmbGroup = new CComboBox("groupid",$_REQUEST["groupid"],"submit()");
-//	$cmbHosts = new CComboBox("hostid",$_REQUEST["hostid"],"submit()");
 	$cmbGroup = new CComboBox("groupid",$_REQUEST["groupid"],"javascript: return updater.onetime_update('".ZBX_PAGE_MAIN_HAT."',this.form);");
 	$cmbHosts = new CComboBox("hostid",$_REQUEST["hostid"],"javascript: return updater.onetime_update('".ZBX_PAGE_MAIN_HAT."',this.form);");
 
@@ -388,6 +386,4 @@
 	}
 	
 	$table->Show();
-	
-
 ?>
\ No newline at end of file
diff --git a/frontends/php/exp_imp.php b/frontends/php/exp_imp.php
index 63ee0f22..31c58bf3 100644
--- a/frontends/php/exp_imp.php
+++ b/frontends/php/exp_imp.php
@@ -189,7 +189,7 @@ include_once "include/page_header.php";
 			$table->SetHeader(array(S_HOST, S_ELEMENTS));
 			$table->ShowStart();
 
-			$db_hosts = DBselect('SELECT * FROM hosts WHERE '.DBcondition('hostid',array_keys($hosts));
+			$db_hosts = DBselect('SELECT * FROM hosts WHERE '.DBcondition('hostid',array_keys($hosts)));
 			while($host = DBfetch($db_hosts)){
 				$el_table = new CTableInfo(S_ONLY_HOST_INFO);
 				$sqls = array(
diff --git a/frontends/php/include/classes/cformtable.inc.php b/frontends/php/include/classes/cformtable.inc.php
index ee5fc85c..e8286b69 100644
--- a/frontends/php/include/classes/cformtable.inc.php
+++ b/frontends/php/include/classes/cformtable.inc.php
@@ -51,9 +51,9 @@
 			$this->SetAlign('center');
 			$this->SetHelp();
 
-			$frm_link = new CLink();
+//			$frm_link = new CLink();
 //			$frm_link->SetName("formtable");
-			$this->AddItemToTopRow($frm_link);
+//			$this->AddItemToTopRow($frm_link);
 			
 			$this->AddVar($form_variable, get_request($form_variable, 1));
 			$this->AddVar('form_refresh',get_request('form_refresh',0)+1);
diff --git a/frontends/php/include/classes/chart.inc.php b/frontends/php/include/classes/chart.inc.php
index eb906689..47f9ed0b 100644
--- a/frontends/php/include/classes/chart.inc.php
+++ b/frontends/php/include/classes/chart.inc.php
@@ -949,10 +949,10 @@ class Chart extends Graph{
 //*
 				if($this->m_maxY[$side]>0){
 			
-					$this->m_maxY[$side] = round($this->m_maxY[$side],1);// + round($this->m_maxY[$side],1)*0.2 + 0.05;
+					$this->m_maxY[$side] = round($this->m_maxY[$side],1) + round($this->m_maxY[$side],1)*0.2 + 0.05;
 				} 
 				else if($this->m_maxY[$side]<0){
-					$this->m_maxY[$side] = round($this->m_maxY[$side],1);// - round($this->m_maxY[$side],1)*0.2 + 0.05;
+					$this->m_maxY[$side] = round($this->m_maxY[$side],1) - round($this->m_maxY[$side],1)*0.2 + 0.05;
 				} 				
 				
 				if($this->m_minY[$side]>0){
diff --git a/frontends/php/include/classes/ctag.inc.php b/frontends/php/include/classes/ctag.inc.php
index ed44da5c..3ddea0d1 100644
--- a/frontends/php/include/classes/ctag.inc.php
+++ b/frontends/php/include/classes/ctag.inc.php
@@ -165,7 +165,7 @@
 			foreach($this->options as $key => $value){
 				$res .= ' '.$key.'="'.$value.'"';
 			}
-			$res .= ($this->paired=='yes') ? '>' : '/>';
+			$res .= ($this->paired=='yes')?'>':' />';
 		return $res;
 		}
 
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 31e737d3..b220d6ae 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1276,10 +1276,10 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 			$url='?';
 			$url_params = explode('&',$_SERVER['QUERY_STRING']);
 			foreach($url_params as $id => $param){
-				if(empty($param)) continue;
+				if(zbx_empty($param)) continue;
 				
 				list($name,$value) = explode('=',$param);
-				if(empty($name) || ($name == 'sort') || (($name == 'sortorder'))) continue;
+				if(zbx_empty($name) || ($name == 'sort') || (($name == 'sortorder'))) continue;
 				$url.=$param.'&';
 			}
 		}
@@ -1287,7 +1287,14 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 			$url.='&';
 		}
 		
-		$link = new CLink($obj,$url.'sort='.$tabfield.'&sortorder='.$sortorder);
+		$url.='sort='.$tabfield.'&sortorder='.$sortorder;
+		
+		if(($page['type'] != PAGE_TYPE_HTML) && defined('ZBX_PAGE_MAIN_HAT')){
+			$link = new CLink($obj,$url,null,"javascript: return updater.onetime_update('".ZBX_PAGE_MAIN_HAT."','".$url."');");
+		}
+		else{
+			$link = new CLink($obj,$url);
+		}
 		
 		if(isset($_REQUEST['sort']) && ($tabfield == $_REQUEST['sort'])){
 			if($sortorder == ZBX_SORT_UP){
diff --git a/frontends/php/include/db.inc.php b/frontends/php/include/db.inc.php
index f46ffb93..92456cc6 100644
--- a/frontends/php/include/db.inc.php
+++ b/frontends/php/include/db.inc.php
@@ -735,8 +735,9 @@ else {
 		$concat = 	$notin?' AND ':' OR ';
 
 		switch($DB['TYPE']) {
+			case 'MYSQL':
 			case 'ORACLE':
-				$items = array_chunk($array, 1000);
+				$items = array_chunk($array, 999);
 				foreach($items as $id => $value){
 					if($notin)
 						$condition.=!empty($condition)?')'.$concat.$fieldname.$in.'(':'';
diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php
index fa7f2e71..d89f2c55 100644
--- a/frontends/php/include/page_header.php
+++ b/frontends/php/include/page_header.php
@@ -394,7 +394,7 @@ COpt::profiling_start("page");
  
 <meta name="Author" content="ZABBIX SIA" />
 
-<link rel="stylesheet" href="css.css" />
+<link rel="stylesheet" type="text/css" href="css.css" />
 <?php
 	if(isset($DB['DB']) && !is_null($DB['DB'])){
 		$css = false;
@@ -410,15 +410,15 @@ COpt::profiling_start("page");
 		}
 		
 		if($css){
-			echo '<link rel="stylesheet" href="styles/'.$css.'" />';
+			echo '<link rel="stylesheet" type="text/css" href="styles/'.$css.'" />'."\n";
 			$ico = ereg_replace('.*(\_[a-z]+).*',"\\1",$css);
 			if(file_exists('images/general/zabbix'.$ico.'.ico'))
-				echo '<link rel="shortcut icon" href="images/general/zabbix'.$ico.'.ico">';
+				echo '<link rel="shortcut icon" href="images/general/zabbix'.$ico.'.ico" />';
 			else
-				echo '<link rel="shortcut icon" href="images/general/zabbix.ico">';
+				echo '<link rel="shortcut icon" href="images/general/zabbix.ico" />';
 		}
 		else{
-			echo '<link rel="shortcut icon" href="images/general/zabbix.ico">';
+			echo '<link rel="shortcut icon" href="images/general/zabbix.ico" />';
 		}
 	}
 ?>
@@ -478,16 +478,19 @@ COpt::compare_files_with_menu($ZBX_MENU);
 			$page_header_r_col[] = array("|", 
 						new CLink(S_PROFILE, "profile.php", "small_font"),"|", 
 						new CLink(S_LOGOUT, "index.php?reconnect=1", "small_font"));
-		} else {
+		} 
+		else {
 			$page_header_r_col[] = array("|", new CLink(S_LOGIN, "index.php?reconnect=1", "small_font"));
 		}
 
 		$logo = new CLink(new CDiv(SPACE,'zabbix_logo'),"http://www.zabbix.com");
 		$logo->SetTarget('_blank');
-//		$logo = new CSpan(SPACE,'zabbix_logo');
+//		$logo = new CDiv(SPACE,'zabbix_logo');
+//		$logo->AddAction('onclick',"javascript: document.location = 'http://www.zabbix.com';");		
+		
 		$td_r = new CCol($page_header_r_col, "page_header_r");
 		$td_r->AddOption('width','100%');
-//		$top_page_row	= array(new CCol($logo, "page_header_l"), new CCol($page_header_r_col, "page_header_r"));
+
 		$top_page_row	= array(new CCol($logo, "page_header_l"), $td_r);
 		unset($logo, $page_header_r_col, $help, $support);
 
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 33aba8f2..d07a37f4 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -218,7 +218,6 @@
 					' AND f.itemid=i.itemid'.
 					(!empty($hostid)?' AND i.hostid='.$hostid:'').
 					(!empty($denied_triggers)?' AND '.DBcondition('t.triggerid',$denied_triggers,true):'');
-
 		$db_triggers = DBselect($sql);
 		while($trigger = DBfetch($db_triggers)){
 			$result[$trigger['triggerid']] = $trigger['triggerid'];
diff --git a/frontends/php/js/updater.js b/frontends/php/js/updater.js
index abf56173..0d90e1e1 100644
--- a/frontends/php/js/updater.js
+++ b/frontends/php/js/updater.js
@@ -105,6 +105,8 @@ inloadobj:		new Array(),			// array containing updated obj and statuses
 		}
 		
 		if('undefined' != this.optlist[obj.id]){
+			var dt = new Date();
+			this.optlist[obj.id].lastupdate = parseInt(dt.getTime()/1000)
 			this.optlist[obj.id].url = update_url+(empty(update_url)?'?':'&')+Object.toQueryString(params);
 		}
 
diff --git a/frontends/php/styles/div.css b/frontends/php/styles/div.css
index 8c2f79e9..0ab52b39 100644
--- a/frontends/php/styles/div.css
+++ b/frontends/php/styles/div.css
@@ -35,8 +35,8 @@ div.onajaxload{
 	position: absolute;
 	background-color:#000000; 
 	
-	filter:alpha(opacity=10);
-	opacity:.10;
+	filter:alpha(opacity=05);
+	opacity:.05;
 	
 	cursor:wait;
 	z-index: 50;
@@ -47,6 +47,7 @@ div.zabbix_logo{
 	height: 31px;
 	width: 118px;
 	background: #FFFFFF url('../images/general/zabbix.png') no-repeat;
+	cursor: pointer;
 }
 
 div.iconminus{
diff --git a/frontends/php/tr_status.php b/frontends/php/tr_status.php
index 3b0324a1..c988a2c6 100644
--- a/frontends/php/tr_status.php
+++ b/frontends/php/tr_status.php
@@ -433,7 +433,7 @@ include_once "include/page_header.php";
 
 	$sql = 'SELECT DISTINCT t.triggerid,t.status,t.description, t.expression,t.priority, '.
 					' t.lastchange,t.comments,t.url,t.value,h.host,h.hostid,t.type '.
-			' FROM triggers t,hosts h,items i,functions f '.
+			' FROM triggers t,hosts h,items i,functions f '.($_REQUEST['groupid']?', hosts_groups hg ':'').
 			' WHERE f.itemid=i.itemid '.
 				' AND h.hostid=i.hostid '.
 				' AND t.triggerid=f.triggerid '.
-- 
cgit