diff --git a/include/class.canned.php b/include/class.canned.php
index 399b490d3a9cf3c1832fc4892c66ccd4aed06f6f..52a487529c368bc158777359260d36b808dc1d90 100644
--- a/include/class.canned.php
+++ b/include/class.canned.php
@@ -270,14 +270,14 @@ class Canned {
if(db_query($sql))
return true;
- $errors['err']='Unable to update canned reply.';
+ $errors['err']='Unable to update canned response.';
} else {
$sql='INSERT INTO '.CANNED_TABLE.' SET '.$sql.',created=NOW()';
if(db_query($sql) && ($id=db_insert_id()))
return $id;
- $errors['err']='Unable to create the canned reply. Internal error';
+ $errors['err']='Unable to create the canned response. Internal error';
}
return false;
diff --git a/include/class.nav.php b/include/class.nav.php
index 1e7aa1819df9827e0773a1f403855c83fa10de5f..0d5fddcbf3a48772db052a71363bfe0fb3b64ad5 100644
--- a/include/class.nav.php
+++ b/include/class.nav.php
@@ -128,7 +128,7 @@ class StaffNav {
if($staff->canManageFAQ())
$subnav[]=array('desc'=>'Categories','href'=>'categories.php','iconclass'=>'faq-categories');
if($staff->canManageCannedResponses())
- $subnav[]=array('desc'=>'Canned Replies','href'=>'canned.php','iconclass'=>'canned');
+ $subnav[]=array('desc'=>'Canned Responses','href'=>'canned.php','iconclass'=>'canned');
}
break;
}
diff --git a/include/staff/cannedreply.inc.php b/include/staff/cannedresponse.inc.php
similarity index 92%
rename from include/staff/cannedreply.inc.php
rename to include/staff/cannedresponse.inc.php
index f18b114a2225fde48d9bddbc73ff3ec93e5a3fd4..768c9742c7459caefcaeb6bb777e753cad06e449 100644
--- a/include/staff/cannedreply.inc.php
+++ b/include/staff/cannedresponse.inc.php
@@ -3,16 +3,16 @@ if(!defined('OSTSCPINC') || !$thisstaff) die('Access Denied');
$info=array();
$qstr='';
if($canned && $_REQUEST['a']!='add'){
- $title='Update Canned Reply';
+ $title='Update Canned Response';
$action='update';
$submit_text='Save Changes';
$info=$canned->getInfo();
$info['id']=$canned->getId();
$qstr.='&id='.$canned->getId();
}else {
- $title='Add New Canned Reply';
+ $title='Add New Canned Response';
$action='create';
- $submit_text='Add Reply';
+ $submit_text='Add Response';
$info['isenabled']=isset($info['isenabled'])?$info['isenabled']:1;
$qstr.='&a='.$_REQUEST['a'];
}
@@ -24,13 +24,13 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
<input type="hidden" name="do" value="<?php echo $action; ?>">
<input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
<input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2>Canned Reply</h2>
+ <h2>Canned Response</h2>
<table class="form_table" width="940" border="0" cellspacing="0" cellpadding="2">
<thead>
<tr>
<th colspan="2">
<h4><?php echo $title; ?></h4>
- <em>Canned reply settings</em>
+ <em>Canned response settings</em>
</th>
</tr>
</thead>
@@ -63,7 +63,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Canned Reply</strong>: Make the title short and clear. </em>
+ <em><strong>Canned Response</strong>: Make the title short and clear. </em>
</th>
</tr>
<tr>
@@ -98,7 +98,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr>
<th colspan="2">
- <em><strong>Internal Notes</strong>: Notes about the canned reply. </em>
+ <em><strong>Internal Notes</strong>: Notes about the canned response. </em>
</th>
</tr>
<tr>
@@ -110,7 +110,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</table>
<?php if ($canned && $canned->getFilters()) { ?>
<br/>
- <div id="msg_warning">Canned reply is in use by email filter(s): <?php
+ <div id="msg_warning">Canned response is in use by email filter(s): <?php
echo implode(', ', $canned->getFilters()); ?></div>
<?php } ?>
<p style="padding-left:225px;">
diff --git a/include/staff/cannedreplies.inc.php b/include/staff/cannedresponses.inc.php
similarity index 96%
rename from include/staff/cannedreplies.inc.php
rename to include/staff/cannedresponses.inc.php
index 2f19cbd194a1ee7570fcda67eca30f295bc1d2fa..a2fe2b02531ce16d735cabee7612e35e10ebc568 100644
--- a/include/staff/cannedreplies.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -47,10 +47,10 @@ else
?>
<div style="width:700;padding-top:5px; float:left;">
- <h2>Canned Replies</h2>
+ <h2>Canned Responses</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
- <b><a href="canned.php?a=add" class="Icon newReply">Add New Reply</a></b></div>
+ <b><a href="canned.php?a=add" class="Icon newReply">Add New Response</a></b></div>
<div class="clear"></div>
<form action="canned.php" method="POST" name="canned" onSubmit="return checkbox_checker(this,1,0);">
<?php csrf_token(); ?>
@@ -105,7 +105,7 @@ else
<a href="#" onclick="return reset_all(document.forms['canned'])">None</a>
<a href="#" onclick="return toogle_all(document.forms['canned'],true)">Toggle</a>
<?php }else{
- echo 'No premade replies';
+ echo 'No canned responses';
} ?>
</td>
</tr>
@@ -117,11 +117,11 @@ if($res && $num): //Show options..
?>
<p class="centered">
<input class="button" type="submit" name="enable" value="Enable"
- onClick=' return confirm("Are you sure you want to ENABLE selected replies?");'>
+ onClick=' return confirm("Are you sure you want to ENABLE selected responses?");'>
<input class="button" type="submit" name="disable" value="Disable"
- onClick=' return confirm("Are you sure you want to DISABLE selected replies?");'>
+ onClick=' return confirm("Are you sure you want to DISABLE selected responses?");'>
<input class="button" type="submit" name="delete" value="Delete"
- onClick=' return confirm("Are you sure you want to DELETE selected replies?");'>
+ onClick=' return confirm("Are you sure you want to DELETE selected responses?");'>
</p>
<?php
endif;
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index df750fe795f680963663edd7282d0bfa66e316ef..8d966d9c2b648645146ed8dff536ad472d20c29c 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -113,7 +113,7 @@ if($res && $num): //Show options..
<input class="button" type="submit" name="public" value="Make Public"
onClick=' return confirm("Are you sure you want to make selected categories PUBLIC?");'>
<input class="button" type="submit" name="private" value="Make Internal"
- onClick=' return confirm("Are you sure you want to make selected replies INTERNAL?");'>
+ onClick=' return confirm("Are you sure you want to make selected categories INTERNAL?");'>
<input class="button" type="submit" name="delete" value="Delete"
onClick=' return confirm("Are you sure you want to DELETE selected categories - including associated FAQs?");'>
</p>
diff --git a/scp/canned.php b/scp/canned.php
index 2a2252233627510e35f0f12da6f9c916751c8143..72a1680aa21b3777afc765a2f2256d2fd433782c 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -2,7 +2,7 @@
/*********************************************************************
canned.php
- Canned Replies aka Premade Responses.
+ Canned Responses aka Premade Responses.
Peter Rotich <peter@osticket.com>
Copyright (c) 2006-2012 osTicket
@@ -25,15 +25,15 @@ if(!$thisstaff || !$thisstaff->canManageCannedResponses()) {
$canned=null;
if($_REQUEST['id'] && !($canned=Canned::lookup($_REQUEST['id'])))
- $errors['err']='Unknown or invalid canned reply ID.';
+ $errors['err']='Unknown or invalid canned response ID.';
if($_POST && $thisstaff->canManageCannedResponses()) {
switch(strtolower($_POST['do'])) {
case 'update':
if(!$canned) {
- $errors['err']='Unknown or invalid canned reply.';
+ $errors['err']='Unknown or invalid canned response.';
} elseif($canned->update($_POST, $errors)) {
- $msg='Canned reply updated successfully';
+ $msg='Canned response updated successfully';
//Delete removed attachments.
//XXX: files[] shouldn't be changed under any circumstances.
$keepers = $_POST['files']?$_POST['files']:array();
@@ -50,7 +50,7 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
$canned->reload();
} elseif(!$errors['err']) {
- $errors['err']='Error updating canned reply. Try again!';
+ $errors['err']='Error updating canned response. Try again!';
}
break;
case 'create':
@@ -75,22 +75,22 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
implode(',', db_input($_POST['ids'])).')';
if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count)
- $msg='Selected canned replies enabled';
+ $msg='Selected canned responses enabled';
else
- $warn="$num of $count selected canned replies enabled";
+ $warn="$num of $count selected canned responses enabled";
} else {
- $errors['err']='Unable to enable selected canned replies.';
+ $errors['err']='Unable to enable selected canned responses.';
}
} elseif($_POST['disable']) {
$sql='UPDATE '.CANNED_TABLE.' SET isenabled=0 WHERE canned_id IN ('.
implode(',', db_input($_POST['ids'])).')';
if(db_query($sql) && ($num=db_affected_rows())) {
if($num==$count)
- $msg='Selected canned replies disabled';
+ $msg='Selected canned responses disabled';
else
- $warn="$num of $count selected canned replies disabled";
+ $warn="$num of $count selected canned responses disabled";
} else {
- $errors['err']='Unable to disable selected canned replies';
+ $errors['err']='Unable to disable selected canned responses';
}
}elseif($_POST['delete']) {
$i=0;
@@ -100,11 +100,11 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
}
if($i==$count)
- $msg='Selected canned replies deleted successfully';
+ $msg='Selected canned responses deleted successfully';
elseif($i>0)
- $warn="$i of $count selected canned replies deleted";
+ $warn="$i of $count selected canned responses deleted";
elseif(!$errors['err'])
- $errors['err']='Unable to delete selected canned replies';
+ $errors['err']='Unable to delete selected canned responses';
} else {
$errors['err']='Unknown command';
@@ -117,9 +117,9 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
}
}
-$page='cannedreplies.inc.php';
+$page='cannedresponses.inc.php';
if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
- $page='cannedreply.inc.php';
+ $page='cannedresponse.inc.php';
$nav->setTabActive('kbase');
require(STAFFINC_DIR.'header.inc.php');