- [NTT-32] merged rev. 4916:4918 of branches/1.4.j/ (Artem) (fixed import/export of triggers)

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

3 files changed, 7 insertions, 2 deletions

diff --git a/frontends/php/include/export.inc.php b/frontends/php/include/export.inc.php
index 77eb49fc..3b851e4f 100644
--- a/frontends/php/include/export.inc.php
+++ b/frontends/php/include/export.inc.php
@@ -66,6 +66,7 @@
 			'attribures'	=> array(),
 			'elements'	=> array(
 				'description'		=> '',
+				'type'				=> '',
 				'expression'		=> '',
 				'url'			=> '',
 				'status'		=> '',
@@ -214,6 +215,7 @@
 			{
 				if(empty($data[$db_name])) continue;
 				if(empty($xml_name)) $xml_name = $db_name;
+				
 				zbx_xmlwriter_write_element ($memory, $xml_name, $data[$db_name]);
 			}
 			zbx_xmlwriter_end_element($memory); // XML_TAG_TRIGGER
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index fe18026d..ba30bd4c 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -180,7 +180,7 @@
 			global $USER_DETAILS;
 			
 			$data = &$this->data[$name];
-
+			
 			switch($name)
 			{
 				case XML_TAG_HOST:
@@ -406,6 +406,7 @@
 				case XML_TAG_TRIGGER:
 					if(!isset($data['expression']))		$data['expression']	= '';
 					if(!isset($data['description']))	$data['description']	= '';
+					if(!isset($data['type']))			$data['type']	= 0;
 					if(!isset($data['priority']))		$data['priority']	= 0;
 					if(!isset($data['status']))		$data['status']		= 0;
 					if(!isset($data['comments']))		$data['comments']	= '';
@@ -446,6 +447,7 @@
 								$trigger['triggerid'],
 								$data['expression'],
 								$data['description'],
+								$data['type'],
 								$data['priority'],
 								$data['status'],
 								$data['comments'],
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 31f7feb8..01a5903d 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -1449,13 +1449,14 @@
 		if(!is_null($priority))		$sql .= " priority=$priority,";
 		if(!is_null($status))		$sql .= " status=$status,";
 		if(!is_null($comments))		$sql .= " comments=".zbx_dbstr($comments).",";
-		if(!is_null($url))		$sql .= " url=".zbx_dbstr($url).",";
+		if(!is_null($url))			$sql .= " url=".zbx_dbstr($url).",";
 		if(!is_null($templateid))	$sql .= " templateid=$templateid,";
 		$sql .= " value=2 where triggerid=$triggerid";
 
 		$result = DBexecute($sql);
 
 		delete_dependencies_by_triggerid($triggerid);
+
 		foreach($deps as $val)
 		{
 			$result=add_trigger_dependency($triggerid, $val);