- [ZBX-301] merged rev. 5545:5547 of 1.4 branch (Artem) [fixes typos]

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

3 files changed, 20 insertions, 20 deletions

diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 11d17553..15bcacc6 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2285,7 +2285,7 @@
 		}
 
 		$dep_el=array();
-		$dependences = get_request("dependences",array());
+		$dependencies = get_request("dependencies",array());
 	
 		$limited = null;
 		
@@ -2324,8 +2324,8 @@
 					" WHERE t.triggerid=d.triggerid_up AND d.triggerid_down=".$_REQUEST["triggerid"]);
 				while($trig=DBfetch($trigs))
 				{
-					if(uint_in_array($trig["triggerid"],$dependences))	continue;
-					array_push($dependences,$trig["triggerid"]);
+					if(uint_in_array($trig["triggerid"],$dependencies))	continue;
+					array_push($dependencies,$trig["triggerid"]);
 				}
 			}
 		}
@@ -2339,23 +2339,23 @@
 					"&srcfld1=expression&expression=' + escape(GetSelectedText(this.form.elements['expression'])),700,200);"))
 			));
 
-	/* dependences */
-		foreach($dependences as $val){
+	/* dependencies */
+		foreach($dependencies as $val){
 			array_push($dep_el,
 				array(
 					new CCheckBox("rem_dependence[]", 'no', null, strval($val)),
 					expand_trigger_description($val)
 				),
 				BR());
-			$frmTrig->AddVar("dependences[]",strval($val));
+			$frmTrig->AddVar("dependencies[]",strval($val));
 		}
 
 		if(count($dep_el)==0)
-			array_push($dep_el, "No dependences defined");
+			array_push($dep_el, "No dependencies defined");
 		else
 			array_push($dep_el, new CButton('del_dependence','delete selected'));
 		$frmTrig->AddRow("The trigger depends on",$dep_el);
-	/* end dependences */
+	/* end dependencies */
 
 		global $USER_DETAILS;
 	/* new dependence */
diff --git a/frontends/php/include/import.inc.php b/frontends/php/include/import.inc.php
index 1380e600..b36bcc46 100644
--- a/frontends/php/include/import.inc.php
+++ b/frontends/php/include/import.inc.php
@@ -483,7 +483,7 @@
 								$data['status'],
 								$data['comments'],
 								$data['url'],
-								get_trigger_dependences_by_triggerid($trigger['triggerid']),
+								get_trigger_dependencies_by_triggerid($trigger['triggerid']),
 								$trigger['templateid']);
 
 							break; // case
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 9e39dcb4..f41a98ee 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -744,7 +744,7 @@
 	 * Comments: !!! Don't forget sync code with C !!!                            *
 	 *                                                                            *
 	 ******************************************************************************/
-	function	get_trigger_dependences_by_triggerid($triggerid)
+	function	get_trigger_dependencies_by_triggerid($triggerid)
 	{
 		$result = array();
 
@@ -760,7 +760,7 @@
 	 * Comments: !!! Don't forget sync code with C !!!                            *
 	 *                                                                            *
 	 ******************************************************************************/
-	function	replace_template_dependences($deps, $hostid)
+	function	replace_template_dependencies($deps, $hostid)
 	{
 		foreach($deps as $id => $val)
 		{
@@ -781,8 +781,8 @@
 	{
 		$trigger = get_trigger_by_triggerid($triggerid);
 
-		$deps = replace_template_dependences(
-				get_trigger_dependences_by_triggerid($triggerid),
+		$deps = replace_template_dependencies(
+				get_trigger_dependencies_by_triggerid($triggerid),
 				$hostid);
 
 		$sql='SELECT t2.triggerid, t2.expression '.
@@ -859,7 +859,7 @@
 
 		DBexecute("update triggers set expression=".zbx_dbstr($newexpression).
 			" where triggerid=$newtriggerid");
-// copy dependences
+// copy dependencies
 		delete_dependencies_by_triggerid($newtriggerid);
 		foreach($deps as $dep_id)
 		{
@@ -1382,7 +1382,7 @@
 						NULL,		// status
 						$comments,
 						$url,
-						replace_template_dependences($deps, $chd_trig_host['hostid']),
+						replace_template_dependencies($deps, $chd_trig_host['hostid']),
 						$triggerid);
 				}
 			}
@@ -1713,11 +1713,11 @@
 			copy_trigger_to_host($trigger["triggerid"], $hostid, $copy_mode);
 		}
 
-		update_template_dependences_for_host($hostid);
+		update_template_dependencies_for_host($hostid);
 	}
 
 	/*
-	 * Function: update_template_dependences_for_host
+	 * Function: update_template_dependencies_for_host
 	 *
 	 * Description: 
 	 *     Update template triggers
@@ -1728,7 +1728,7 @@
 	 * Comments: !!! Don't forget sync code with C !!!
 	 *
 	 */
-	function	update_template_dependences_for_host($hostid)
+	function	update_template_dependencies_for_host($hostid)
 	{
 		$db_triggers = get_triggers_by_hostid($hostid);
 		while($trigger_data = DBfetch($db_triggers))
@@ -1743,8 +1743,8 @@
 					/*$status*/			NULL,
 					/*$comments*/		NULL,
 					/*$url*/			NULL,
-					replace_template_dependences(
-						get_trigger_dependences_by_triggerid($trigger_data['triggerid']),
+					replace_template_dependencies(
+						get_trigger_dependencies_by_triggerid($trigger_data['triggerid']),
 						$hostid),
 					$trigger_data['triggerid']);