Skip to content
Snippets Groups Projects
Commit b24f18d9 authored by Peter Rotich's avatar Peter Rotich
Browse files

Change reject_email to reject_ticket

parent 50f1debc
Branches
Tags
No related merge requests found
/** /**
* @version v1.7 RC3 * @version v1.7 RC3
* @signature 58ef694d5ebf73cc291e07e597c6f85d * @signature fa8bd41a6fbee9f2bd97c59f4d0778ba
* *
* Upgrade from 1.6 RC3 + filters * Upgrade from 1.6 RC3 + filters
* *
...@@ -10,10 +10,12 @@ RENAME TABLE `%TABLE_PREFIX%email_filter` TO `%TABLE_PREFIX%filter`; ...@@ -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`; 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` ALTER TABLE `%TABLE_PREFIX%filter`
ADD `target` ENUM( 'All', 'Web', 'Email', 'API' ) NOT NULL DEFAULT 'All' AFTER `sla_id` , ADD `target` ENUM( 'All', 'Web', 'Email', 'API' ) NOT NULL DEFAULT 'All' AFTER `sla_id` ,
ADD INDEX ( `target` ); ADD INDEX ( `target` );
-- Finished with patch -- Finished with patch
UPDATE `%TABLE_PREFIX%config` UPDATE `%TABLE_PREFIX%config`
SET `schema_signature`='58ef694d5ebf73cc291e07e597c6f85d'; SET `schema_signature`='fa8bd41a6fbee9f2bd97c59f4d0778ba';
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#Current version && schema signature (Changes from version to version) #Current version && schema signature (Changes from version to version)
define('THIS_VERSION','1.7-RC2'); //Shown on admin panel 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 #load config info
$configfile=''; $configfile='';
if(file_exists(ROOT_DIR.'ostconfig.php')) //Old installs prior to v 1.6 RC5 if(file_exists(ROOT_DIR.'ostconfig.php')) //Old installs prior to v 1.6 RC5
......
...@@ -235,7 +235,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` ( ...@@ -235,7 +235,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` (
`isactive` tinyint(1) unsigned NOT NULL default '1', `isactive` tinyint(1) unsigned NOT NULL default '1',
`match_all_rules` tinyint(1) unsigned NOT NULL default '0', `match_all_rules` tinyint(1) unsigned NOT NULL default '0',
`stop_onmatch` 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', `use_replyto_email` tinyint(1) unsigned NOT NULL default '0',
`disable_autoresponder` 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', `canned_response_id` int(11) unsigned NOT NULL default '0',
...@@ -257,7 +257,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` ( ...@@ -257,7 +257,7 @@ CREATE TABLE `%TABLE_PREFIX%filter` (
INSERT INTO `%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()); 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`; DROP TABLE IF EXISTS `%TABLE_PREFIX%filter_rule`;
......
58ef694d5ebf73cc291e07e597c6f85d fa8bd41a6fbee9f2bd97c59f4d0778ba
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment