From 617f386ded683b2a7db660446a5926bea57260d9 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Fri, 13 Jul 2012 15:59:40 -0500
Subject: [PATCH] Fix email filter -> canned response reference
---
include/class.filter.php | 2 +-
include/staff/filter.inc.php | 11 ++++++-----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index a749e5eae..4f000901f 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -401,7 +401,7 @@ class Filter {
',reject_email='.db_input(isset($vars['reject_email'])?1:0).
',use_replyto_email='.db_input(isset($vars['use_replyto_email'])?1:0).
',disable_autoresponder='.db_input(isset($vars['disable_autoresponder'])?1:0).
- ',canned_response_id='.db_input($vars['canned_response']).
+ ',canned_response_id='.db_input($vars['canned_response_id']).
',notes='.db_input($vars['notes']);
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index b23dd520b..f57a09a42 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -186,14 +186,15 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
Canned Response:
</td>
<td>
- <select name="canned_response">
+ <select name="canned_response_id">
<option value="">— None —</option>
<?php
- $sql='SELECT canned_id,title FROM '.CANNED_TABLE.' ORDER by title';
+ $sql='SELECT canned_id,title FROM '.CANNED_TABLE
+ .' WHERE isenabled ORDER by title';
if ($res=db_query($sql)) {
while (list($id,$title)=db_fetch_row($res)) {
- $selected=($info['canned_response'] &&
- $id==$info['canned_response'])
+ $selected=($info['canned_response_id'] &&
+ $id==$info['canned_response_id'])
? 'selected="selected"' : '';
echo sprintf('<option value="%d" %s>%s</option>',
$id, $selected, $title);
@@ -201,7 +202,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
}
?>
</select>
- <em>(Automatically respond with this canned attachment)</em>
+ <em>(Automatically respond with this canned response)</em>
</td>
</tr>
<tr>
--
GitLab