From b24f18d9ee942ced9df0e42496830937914c3548 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Fri, 31 Aug 2012 19:14:09 -0400
Subject: [PATCH] Change reject_email to reject_ticket
---
include/upgrader/sql/d0e37dca-fa8bd41a.patch.sql | 6 ++++--
main.inc.php | 2 +-
setup/inc/sql/osTicket-mysql.sql | 4 ++--
setup/inc/sql/osTicket-mysql.sql.md5 | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/include/upgrader/sql/d0e37dca-fa8bd41a.patch.sql b/include/upgrader/sql/d0e37dca-fa8bd41a.patch.sql
index 337cffa79..1dc463685 100644
--- a/include/upgrader/sql/d0e37dca-fa8bd41a.patch.sql
+++ b/include/upgrader/sql/d0e37dca-fa8bd41a.patch.sql
@@ -1,6 +1,6 @@
/**
* @version v1.7 RC3
- * @signature 58ef694d5ebf73cc291e07e597c6f85d
+ * @signature fa8bd41a6fbee9f2bd97c59f4d0778ba
*
* Upgrade from 1.6 RC3 + filters
*
@@ -10,10 +10,12 @@ RENAME TABLE `%TABLE_PREFIX%email_filter` TO `%TABLE_PREFIX%filter`;
RENAME TABLE `%TABLE_PREFIX%email_filter_rule` TO `%TABLE_PREFIX%filter_rule`;
+ALTER TABLE `%TABLE_PREFIX%filter` CHANGE `reject_email` `reject_ticket` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
+
ALTER TABLE `%TABLE_PREFIX%filter`
ADD `target` ENUM( 'All', 'Web', 'Email', 'API' ) NOT NULL DEFAULT 'All' AFTER `sla_id` ,
ADD INDEX ( `target` );
-- Finished with patch
UPDATE `%TABLE_PREFIX%config`
- SET `schema_signature`='58ef694d5ebf73cc291e07e597c6f85d';
+ SET `schema_signature`='fa8bd41a6fbee9f2bd97c59f4d0778ba';
diff --git a/main.inc.php b/main.inc.php
index d9ee629e1..f737c361b 100644
--- a/main.inc.php
+++ b/main.inc.php
@@ -63,7 +63,7 @@
#Current version && schema signature (Changes from version to version)
define('THIS_VERSION','1.7-RC2'); //Shown on admin panel
- define('SCHEMA_SIGNATURE','58ef694d5ebf73cc291e07e597c6f85d'); //MD5 signature of the db schema. (used to trigger upgrades)
+ define('SCHEMA_SIGNATURE','fa8bd41a6fbee9f2bd97c59f4d0778ba'); //MD5 signature of the db schema. (used to trigger upgrades)
#load config info
$configfile='';
if(file_exists(ROOT_DIR.'ostconfig.php')) //Old installs prior to v 1.6 RC5
diff --git a/setup/inc/sql/osTicket-mysql.sql b/setup/inc/sql/osTicket-mysql.sql
index 614a0fa07..fa183d964 100644
--- a/setup/inc/sql/osTicket-mysql.sql
+++ b/setup/inc/sql/osTicket-mysql.sql
@@ -235,7 +235,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` (
`isactive` tinyint(1) unsigned NOT NULL default '1',
`match_all_rules` tinyint(1) unsigned NOT NULL default '0',
`stop_onmatch` tinyint(1) unsigned NOT NULL default '0',
- `reject_email` tinyint(1) unsigned NOT NULL default '0',
+ `reject_ticket` tinyint(1) unsigned NOT NULL default '0',
`use_replyto_email` tinyint(1) unsigned NOT NULL default '0',
`disable_autoresponder` tinyint(1) unsigned NOT NULL default '0',
`canned_response_id` int(11) unsigned NOT NULL default '0',
@@ -257,7 +257,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` (
INSERT INTO `%TABLE_PREFIX%filter` (
- `id`,`isactive`,`execorder`,`reject_email`,`name`,`notes`,`created`)
+ `id`,`isactive`,`execorder`,`reject_ticket`,`name`,`notes`,`created`)
VALUES (1, 1, 99, 1, 'SYSTEM BAN LIST', 'Internal list for email banning. Do not remove', NOW());
DROP TABLE IF EXISTS `%TABLE_PREFIX%filter_rule`;
diff --git a/setup/inc/sql/osTicket-mysql.sql.md5 b/setup/inc/sql/osTicket-mysql.sql.md5
index bf779b6ab..24d771c4f 100644
--- a/setup/inc/sql/osTicket-mysql.sql.md5
+++ b/setup/inc/sql/osTicket-mysql.sql.md5
@@ -1 +1 @@
-58ef694d5ebf73cc291e07e597c6f85d
+fa8bd41a6fbee9f2bd97c59f4d0778ba
--
GitLab