From f0c14459e2bb51c52ce9ed9ec2b36f4cae938ade Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 28 Sep 2006 00:40:47 +0000
Subject: [PATCH] r1195: Final renames going in

---
 docs/recache.php         |  2 +-
 editreport.php           | 24 ++++++++++++------------
 showreport.php           | 16 ++++++++--------
 templates/showreport.tpl |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/docs/recache.php b/docs/recache.php
index 9570c22..09e018f 100755
--- a/docs/recache.php
+++ b/docs/recache.php
@@ -54,7 +54,7 @@ echo '<p>Permissions cached</p>';
 
 build_automations();
 
-echo '<p>Auto actions cached</p>';
+echo '<p>Automations cached</p>';
 
 build_user_help();
 
diff --git a/editreport.php b/editreport.php
index f6f22f5..89009dc 100644
--- a/editreport.php
+++ b/editreport.php
@@ -118,23 +118,23 @@ if ($_POST['do'] == 'update')
 	$log->add_data(true, $bugapi->objdata, $bugfields);
 	
 	// -------------------------------------------------------------------
-	// handle autoaction
-	$autoaction = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "autoaction WHERE actionid = " . $bugsys->input_clean('autoaction', TYPE_UINT));
-	if ($autoaction)
+	// handle automations
+	$automation = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "automation WHERE actionid = " . $bugsys->input_clean('automation', TYPE_UINT));
+	if ($automation)
 	{
-		$autoaction['fields'] = unserialize($autoaction['fieldchanges']);
+		$automation['fields'] = unserialize($automation['fieldchanges']);
 		
-		if (is_array($autoaction['fields']['builtin']))
+		if (is_array($automation['fields']['builtin']))
 		{
-			foreach ($autoaction['fields']['builtin'] AS $field => $value)
+			foreach ($automation['fields']['builtin'] AS $field => $value)
 			{
 				$bugsys->in["$field"] = $value;
 			}
 		}
 		
-		if (is_array($autoaction['fields']['custom']))
+		if (is_array($automation['fields']['custom']))
 		{
-			foreach ($autoaction['fields']['custom'] AS $field => $value)
+			foreach ($automation['fields']['custom'] AS $field => $value)
 			{
 				$bugsys->in["field$field"] = $value;
 			}
@@ -174,13 +174,13 @@ if ($_POST['do'] == 'update')
 	// process comment stuff
 	if ($bugsys->in['comment'])
 	{
-		if (!empty($bugsys->in['comment']) AND $autoaction['comment'])
+		if (!empty($bugsys->in['comment']) AND $automation['comment'])
 		{
-			$commenttext = $bugsys->in['comment'] . "\n\n" . _('--------------- AUTOMATIC RESPONSE ---------------') . "\n" . $autoaction['comment'];
+			$commenttext = $bugsys->in['comment'] . "\n\n" . _('--------------- AUTOMATIC RESPONSE ---------------') . "\n" . $automation['comment'];
 		}
-		else if (empty($bugsys->in['comment']) AND $autoaction['comment'])
+		else if (empty($bugsys->in['comment']) AND $automation['comment'])
 		{
-			$commenttext = $autoaction['comment'];
+			$commenttext = $automation['comment'];
 		}
 		else
 		{
diff --git a/showreport.php b/showreport.php
index 3c5396b..71e40a5 100644
--- a/showreport.php
+++ b/showreport.php
@@ -140,24 +140,24 @@ if ($show['edit'])
 		$dependencies = implode(' ', $depends);
 	}
 	
-	$select['autoactions'] = '';
-	$show['autoactions'] = false;
-	if (is_array($bugsys->datastore['autoaction']))
+	$select['automations'] = '';
+	$show['automations'] = false;
+	if (is_array($bugsys->datastore['automation']))
 	{
-		foreach ($bugsys->datastore['autoaction'] AS $action)
+		foreach ($bugsys->datastore['automation'] AS $action)
 		{
 			$label = $action['name'];
 			$value = $action['actionid'];
 			$selected = false;
-			eval('$select[autoaction] .= "' . $template->fetch('selectoption') . '";');
-			$show['autoactions'] = true;
+			eval('$select[automation] .= "' . $template->fetch('selectoption') . '";');
+			$show['automations'] = true;
 		}
-		if ($show['autoactions'])
+		if ($show['automations'])
 		{
 			$label = '';
 			$value = 0;
 			$selected = true;
-			eval('$select[autoaction] = "' . $template->fetch('selectoption') . '" . $select[autoaction];');
+			eval('$select[automation] = "' . $template->fetch('selectoption') . '" . $select[automation];');
 		}
 	}
 }
diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index ffed633..46e5fc8 100644
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -193,7 +193,7 @@ $header
 <if condition="$show['newreply']">
 <!-- new reply -->
 <fieldset>
-	<legend>{@"New Reply"}<if condition="$show['autoactions']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="autoaction">$select[autoaction]</select></if> $help[newreply]</legend>
+	<legend>{@"New Reply"}<if condition="$show['automations']"> : <a href="explain.php?do=automations">{@"Automation"}</a> <select name="automation">$select[automation]</select></if> $help[newreply]</legend>
 
 	<textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea>
 </fieldset>
-- 
2.22.5