From f59d94b2e5823769bc99b61f3586727c6a993225 Mon Sep 17 00:00:00 2001
From: Jared Hancock <gravydish@gmail.com>
Date: Sat, 21 Jul 2012 17:07:14 -0500
Subject: [PATCH] Move supported filter operations to class Filter
And remove unsupported filter of email headers
---
include/class.filter.php | 16 ++++++++++++++++
include/staff/filter.inc.php | 5 ++---
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/include/class.filter.php b/include/class.filter.php
index a69439d93..53801ce0d 100644
--- a/include/class.filter.php
+++ b/include/class.filter.php
@@ -281,6 +281,22 @@ class Filter {
if ($this->getCannedResponse())
$ticket['cannedResponseId'] = $this->getCannedResponse();
}
+ /* static */ function getSupportedMatches() {
+ return array(
+ 'name'=> "Sender's Name",
+ 'email'=> "Sender's Email",
+ 'subject'=> 'Email Subject',
+ 'body'=> 'Email Body/Text'
+ );
+ }
+ /* static */ function getSupportedMatchTypes() {
+ return array(
+ 'equal'=> 'Equal',
+ 'not_equal'=> 'Not Equal',
+ 'contains'=> 'Contains',
+ 'dn_contain'=> 'Does Not Contain'
+ );
+ }
function update($vars,&$errors){
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index b23dd520b..705b7f8ab 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -1,9 +1,8 @@
<?php
if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin()) die('Access Denied');
-$matches=array('name'=>"Sender's Name",'email'=>"Sender's Email",'subject'=>'Email Subject','body'=>'Email Body/Text','header'=>'Email Header');
-$match_types=array('equal'=>'Equal','not_equal'=>'Not Equal','contains'=>'Contains','dn_contain'=>'Does Not Contain');
-
+$matches=Filter::getSupportedMatches();
+$match_types=Filter::getSupportedMatchTypes();
$info=array();
$qstr='';
--
GitLab