- [DEV-137] fixes for oracle (Artem)

 - [DEV-137] small fixes (Artem)

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

7 files changed, 49 insertions, 43 deletions

diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php
index 8ed58124..73147bfd 100644
--- a/frontends/php/graphs.php
+++ b/frontends/php/graphs.php
@@ -86,8 +86,9 @@ include_once "include/page_header.php";
 	check_fields($fields);
 	validate_sort_and_sortorder('g.name',ZBX_SORT_UP);
 
-	$options = array("allow_all_hosts","with_monitored_items","only_current_node","always_select_first_host");
+	$options = array('allow_all_hosts','only_current_node','always_select_first_host');//'with_monitored_items',
 	validate_group_with_host(PERM_READ_WRITE,$options,'web.last.conf.groupid', 'web.last.conf.hostid');
+//SDI($_REQUEST['groupid'].' : '.$_REQUEST['hostid']);
 ?>
 <?php
 
@@ -96,8 +97,8 @@ include_once "include/page_header.php";
 	$_REQUEST['graph3d'] = get_request('graph3d', 0);
 	$_REQUEST['legend'] = get_request('legend', 0);
 	
-	$available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE);
-	$available_graphs = get_accessible_graphs(PERM_READ_WRITE);
+	$available_hosts = get_accessible_hosts_by_user($USER_DETAILS,PERM_READ_WRITE,PERM_RES_IDS_ARRAY);
+	$available_graphs = get_accessible_graphs(PERM_READ_WRITE,PERM_RES_IDS_ARRAY);
 
 // ---- <ACTIONS> ----
 	if(isset($_REQUEST["clone"]) && isset($_REQUEST["graphid"])){
@@ -108,10 +109,10 @@ include_once "include/page_header.php";
 		$items = get_request('items', array());
 		foreach($items as $gitem){
 			$sql = 'SELECT h.hostid '.
-							' FROM hosts h,items i '.
-							' WHERE h.hostid=i.hostid '.
-								' AND i.itemid='.$gitem['itemid'].
-								' AND h.hostid NOT IN ('.$available_hosts.')';
+					' FROM hosts h,items i '.
+					' WHERE h.hostid=i.hostid '.
+						' AND i.itemid='.$gitem['itemid'].
+						' AND '.DBcondition('h.hostid',$available_hosts,true);
 			if(DBfetch(DBselect($sql,1))){
 				access_deny();
 			}
@@ -201,10 +202,13 @@ include_once "include/page_header.php";
 			}
 			else{ /* groups */
 				$hosts_ids = array();
-				$db_hosts = DBselect('SELECT distinct h.hostid FROM hosts h, hosts_groups hg'.
-					' WHERE h.hostid=hg.hostid AND hg.groupid in ('.implode(',',$_REQUEST['copy_targetid']).')'.
-					' AND h.hostid in ('.$available_hosts.")"
-					);
+				
+				$sql = 'SELECT distinct h.hostid '.
+						' FROM hosts h, hosts_groups hg'.
+						' WHERE h.hostid=hg.hostid '.
+							' AND hg.groupid IN ('.implode(',',$_REQUEST['copy_targetid']).')'.
+							' AND '.DBcondition('h.hostid',$available_hosts);
+				$db_hosts = DBselect($sql);
 				while($db_host = DBfetch($db_hosts)){
 					array_push($hosts_ids, $db_host['hostid']);
 				}
@@ -265,7 +269,7 @@ include_once "include/page_header.php";
 		}
 	}
 // ----</ACTIONS>----
-	$available_graphs = get_accessible_graphs(PERM_READ_WRITE);
+	$available_graphs = get_accessible_graphs(PERM_READ_WRITE, PERM_RES_IDS_ARRAY);
 ?>
 <?php
 	$form = new CForm();
@@ -298,8 +302,7 @@ include_once "include/page_header.php";
 	} 
 	else {
 /* Table HEADER */
-		if(isset($_REQUEST["graphid"])&&($_REQUEST["graphid"]==0))
-		{
+		if(isset($_REQUEST["graphid"])&&($_REQUEST["graphid"]==0)){
 			unset($_REQUEST["graphid"]);
 		}
 
@@ -314,7 +317,7 @@ include_once "include/page_header.php";
 		$sql = 'SELECT DISTINCT g.groupid,g.name '.
 			' FROM groups g, hosts_groups hg '.
 			' WHERE hg.groupid = g.groupid '.
-				' AND hg.hostid IN ('.$available_hosts.') '.
+				' AND '.DBcondition('hg.hostid',$available_hosts).
 			' ORDER BY g.name';
 		$result=DBselect($sql);
 		while($row=DBfetch($result)){
@@ -327,14 +330,16 @@ include_once "include/page_header.php";
 				' FROM hosts h, hosts_groups hg '.
 				' WHERE hg.groupid='.$_REQUEST["groupid"].
 					' AND hg.hostid=h.hostid '.
-					' AND h.hostid IN ('.$available_hosts.') '.
+					' AND '.DBcondition('h.hostid',$available_hosts).
+					' AND h.status IN ('.HOST_STATUS_MONITORED.','.HOST_STATUS_TEMPLATE.') '.
 				' ORDER BY h.host';
 		}
 		else{
 			$cmbHosts->AddItem(0,S_ALL_SMALL);
 			$sql='SELECT DISTINCT h.hostid,h.host '.
 				' FROM hosts h '.
-				' WHERE h.hostid IN ('.$available_hosts.') '.
+				' WHERE '.DBcondition('h.hostid',$available_hosts).
+					' AND h.status IN ('.HOST_STATUS_MONITORED.','.HOST_STATUS_TEMPLATE.') '.
 				' ORDER BY h.host';
 		}
 		
@@ -364,7 +369,7 @@ include_once "include/page_header.php";
 		if($_REQUEST["hostid"] > 0){
 			$result = DBselect('SELECT DISTINCT g.* '.
 						' FROM graphs g, graphs_items gi,items i '.
-						' WHERE g.graphid IN ('.$available_graphs.') '.
+						' WHERE '.DBcondition('g.graphid',$available_graphs).
 							' AND gi.graphid=g.graphid '.
 							' AND i.itemid=gi.itemid '.
 							' AND i.hostid='.$_REQUEST['hostid'].
@@ -373,7 +378,7 @@ include_once "include/page_header.php";
 		else{
 			$result = DBselect('SELECT DISTINCT g.* '.
 						' FROM graphs g '.
-						' WHERE g.graphid IN ('.$available_graphs.') '.
+						' WHERE '.DBcondition('g.graphid',$available_graphs).
 						order_by('g.name,g.width,g.height,g.graphtype','g.graphid'));
 		}
 		
diff --git a/frontends/php/include/blocks.inc.php b/frontends/php/include/blocks.inc.php
index 5652feb8..e1dc3bd7 100644
--- a/frontends/php/include/blocks.inc.php
+++ b/frontends/php/include/blocks.inc.php
@@ -979,7 +979,7 @@ function add_refresh_objects($ref_tab){
 }
 
 function get_refresh_obj_script($obj){
-	$obj['url'] = (isset($obj['url']))?$obj['url']:'dashboard.php?output=html';
+	$obj['url'] = (isset($obj['url']))?$obj['url']:'?output=html';
 return 'updater.setObj4Update("'.$obj['id'].'",'.$obj['interval'].',"'.$obj['url'].'",{"favobj": "refresh", "favid": "'.$obj['id'].'"});';
 }
 
diff --git a/frontends/php/include/defines.inc.php b/frontends/php/include/defines.inc.php
index 7176620a..5f795e3c 100644
--- a/frontends/php/include/defines.inc.php
+++ b/frontends/php/include/defines.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* 
 ** ZABBIX
-** Copyright (C) 2000-2005 SIA Zabbix
+** Copyright (C) 2000-2008 SIA Zabbix
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
 	define('PAGE_TYPE_JS',			3);	//javascript
 	define('PAGE_TYPE_HTML_BLOCK',	4);	//simple block of html (as text)
 	
-	define('ZBX_LOGIN_ATTEMPTS', 5);
-	define('ZBX_LOGIN_BLOCK', 30);	// sec
+	define('ZBX_LOGIN_ATTEMPTS', 	5);
+	define('ZBX_LOGIN_BLOCK', 		30); // sec
 	
 	define('ZBX_SESSION_ACTIVE', 0);
 	define('ZBX_SESSION_PASSIVE', 1);
diff --git a/frontends/php/include/export.inc.php b/frontends/php/include/export.inc.php
index c8f23a7a..3c6dc567 100644
--- a/frontends/php/include/export.inc.php
+++ b/frontends/php/include/export.inc.php
@@ -40,7 +40,6 @@
 			'elements'	=> array(
 				'depends'		=> '')
 			),
-// based on mod by scricca
 		XML_TAG_HOSTPROFILE => array(
 			'attribures'	=> array(),
 			'elements'	=> array(
@@ -318,7 +317,6 @@
 			
 // based on  mod by scricca
 			$data = DBfetch(DBselect('SELECT hp.* FROM hosts_profiles hp WHERE hp.hostid='.$hostid));
-//			if(!$data) return false;
 			if($data){
 				zbx_xmlwriter_start_element ($memory,XML_TAG_HOSTPROFILE);
 				
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 51160467..3be5b593 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2060,7 +2060,7 @@
 		$target_list = array();
 		while($target = DBfetch($db_targets)){
 			array_push($target_list,array(
-				new CCheckBox('copy_targetid[]',
+				new CCheckBox('copy_targetid['.$target['target_id'].']',
 					uint_in_array($target['target_id'], $copy_targetid), 
 					null, 
 					$target['target_id']),
@@ -4707,7 +4707,7 @@
  			$frmHostT->AddVar("hostid",$_REQUEST["hostid"]);
  		}
  
- 		$frmHostT->AddRow(S_TEMPLATE,new CTextBox("tname",$name,60));
+ 		$frmHostT->AddRow(S_TEMPLATE,new CTextBox("tname",$name,60,'yes'));
  
 		$hosts_in_tpl = array();
 		$sql = 'SELECT DISTINCT h.hostid,h.host '.
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index 41bf60ba..6df83045 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -575,12 +575,12 @@
 						}
 					}
 					else{
-						if($graph = DBfetch(DBselect('select distinct g.graphid, g.templateid'.
-							' from graphs g, graphs_items gi, items i'.
-							' where g.graphid=gi.graphid '.
-								' and gi.itemid=i.itemid'.
-								' and g.name='.zbx_dbstr($data['name']).
-								' and i.hostid='.$this->data[XML_TAG_HOST]['hostid'])))
+						if($graph = DBfetch(DBselect('SELECT DISTINCT g.graphid, g.templateid'.
+							' FROM graphs g, graphs_items gi, items i'.
+							' WHERE g.graphid=gi.graphid '.
+								' AND gi.itemid=i.itemid'.
+								' AND g.name='.zbx_dbstr($data['name']).
+								' AND i.hostid='.$this->data[XML_TAG_HOST]['hostid'])))
 						{ /* exist */
 							if($this->graph['exist']==1){ /* skip */
 								info('Graph ['.$data['name'].'] skipped - user rule');
diff --git a/frontends/php/report2.php b/frontends/php/report2.php
index 0853cd3c..f1c58b1f 100644
--- a/frontends/php/report2.php
+++ b/frontends/php/report2.php
@@ -138,6 +138,19 @@ include_once 'include/page_header.php';
 		$table->Show();
 	}
 	else if(isset($_REQUEST['hostid'])){
+		
+/*
+		if($_REQUEST['hostid'] > 0){
+			$row	= DBfetch(DBselect('SELECT host FROM hosts WHERE hostid='.$_REQUEST['hostid']));
+			show_table_header($row['host']);
+		}
+		else{
+			if(isset($_REQUEST['tpl_triggerid']) && ($_REQUEST['tpl_triggerid'] > 0))
+				show_table_header(expand_trigger_description($_REQUEST['tpl_triggerid']));
+			else
+				show_table_header(S_ALL_HOSTS_BIG);				
+		}
+//*/
 /************************* FILTER *************************/
 /***********************************************************/	
 		$filterForm = new CFormTable(S_FILTER);//,'events.php?filter_set=1','POST',null,'sform');
@@ -226,16 +239,6 @@ include_once 'include/page_header.php';
 				$sql_cond.= ' AND t.templateid='.$_REQUEST['tpl_triggerid'];
 		}
 		
-		if($_REQUEST['hostid'] > 0){
-			$row	= DBfetch(DBselect('SELECT host FROM hosts WHERE hostid='.$_REQUEST['hostid']));
-			show_table_header($row['host']);
-		}
-		else{
-			if(isset($_REQUEST['tpl_triggerid']) && ($_REQUEST['tpl_triggerid'] > 0))
-				show_table_header(expand_trigger_description($_REQUEST['tpl_triggerid']));
-			else
-				show_table_header(S_ALL_HOSTS_BIG);				
-		}
 		$result = DBselect('SELECT DISTINCT h.hostid,h.host,t.triggerid,t.expression,t.description,t.value '.
 			' FROM triggers t,hosts h,items i,functions f, hosts_templates ht, groups g, hosts_groups hg '.
 			' WHERE f.itemid=i.itemid '.