- [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

5 files changed, 12 insertions, 14 deletions

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');