diff --git a/include/ajax.upgrader.php b/include/ajax.upgrader.php
index 92a3e6ef7884a47f9ae6d52a50606cf1f080acc4..b04dfca4f3f429ef73536fccc9929fda33e797c2 100644
--- a/include/ajax.upgrader.php
+++ b/include/ajax.upgrader.php
@@ -43,12 +43,17 @@ class UpgraderAjaxAPI extends AjaxController {
//More pending tasks - doTasks returns the number of pending tasks
Http::response(200, $upgrader->getNextAction());
exit;
- } elseif($ost->isUpgradePending() && $upgrader->isUpgradable()) {
- $version = $upgrader->getNextVersion();
- if($upgrader->upgrade()) {
- //We're simply reporting progress here - call back will report next action'
- Http::response(200, "Upgraded to $version ... post-upgrade checks!");
- exit;
+ } elseif($ost->isUpgradePending()) {
+ if($upgrader->isUpgradable()) {
+ $version = $upgrader->getNextVersion();
+ if($upgrader->upgrade()) {
+ //We're simply reporting progress here - call back will report next action'
+ Http::response(200, "Upgraded to $version ... post-upgrade checks!");
+ exit;
+ }
+ } else {
+ //Abort: Upgrade pending but NOT upgradable - invalid or wrong hash.
+ $upgrader->abort(sprintf('Upgrade Failed: Invalid or wrong hash [%s]',$ost->getDBSignature()));
}
} elseif(!$ost->isUpgradePending()) {
$upgrader->setState('done');
diff --git a/include/class.upgrader.php b/include/class.upgrader.php
index c886bb0ab927f2e59e1dd656b7e593b6f4ae490b..b08d319d8db65eb1dcd267e8ec43eb037d470bf1 100644
--- a/include/class.upgrader.php
+++ b/include/class.upgrader.php
@@ -278,7 +278,7 @@ class Upgrader extends SetupWizard {
$tasks[] = array('func' => 'migrateAPIKeys',
'desc' => 'Migrating API keys to a new table');
break;
- case '435c62c3-6007d45b':
+ case '435c62c3-2e7531a2':
$tasks[] = array('func' => 'migrateGroupDeptAccess',
'desc' => 'Migrating group\'s department access to a new table');
break;
diff --git a/include/upgrader/sql/435c62c3-2e7531a2.patch.sql b/include/upgrader/sql/435c62c3-2e7531a2.patch.sql
index 4fa5190600d05934df5669a781e89c775b6d1e1c..9537d1acba838be54ec1ece8c7ab4a80545f1bc0 100644
--- a/include/upgrader/sql/435c62c3-2e7531a2.patch.sql
+++ b/include/upgrader/sql/435c62c3-2e7531a2.patch.sql
@@ -28,4 +28,4 @@ UPDATE `%TABLE_PREFIX%groups`
-- Finished with patch
UPDATE `%TABLE_PREFIX%config`
- SET `schema_signature`='6007d45b580c6ac0206514dbed0f28a6';
+ SET `schema_signature`='2e7531a201b5b8650dcd43681a832ebd';
diff --git a/scp/upgrade.php b/scp/upgrade.php
index 3bb850e837671a556996b1e8b0fb877fe53560f9..4ca5f71561e06abaeee8fb2b4e2bb69960c1cf80 100644
--- a/scp/upgrade.php
+++ b/scp/upgrade.php
@@ -71,7 +71,8 @@ switch(strtolower($upgrader->getState())) {
elseif(!$ost->isUpgradePending())
$errors['err']='Nothing to do! System already upgraded to <b>'.$ost->getVersion().'</b> with no pending patches to apply.';
elseif(!$upgrader->isUpgradable())
- $errors['err']='The upgrader does NOT support upgrading from the current vesion!';
+ $errors['err']=sprintf('The upgrader does NOT support upgrading from the current patch [%s]!', $cfg->getSchemaSignature());
+
}
$nav = new AdminNav($thisstaff);
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 7791d9f4bc8dc3ddab88852fd688db8603e19a2e..2d284ecedca1e48b25a2fdfd25ad912ec449912a 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -99,7 +99,7 @@ class Installer extends SetupWizard {
define('ADMIN_EMAIL',$vars['admin_email']); //Needed to report SQL errors during install.
define('PREFIX',$vars['prefix']); //Table prefix
- $schemaFile =INC_DIR.'sql/osticket-v1.7-mysql.sql'; //DB dump.
+ $schemaFile =INC_DIR.'sql/osTicket-mysql.sql'; //DB dump.
$debug = true; //XXX:Change it to true to show SQL errors.
//Last minute checks.
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql b/setup/inc/sql/osTicket-mysql.sql
similarity index 100%
rename from setup/inc/sql/osticket-v1.7-mysql.sql
rename to setup/inc/sql/osTicket-mysql.sql
diff --git a/setup/inc/sql/osticket-v1.7-mysql.sql.md5 b/setup/inc/sql/osTicket-mysql.sql.md5
similarity index 100%
rename from setup/inc/sql/osticket-v1.7-mysql.sql.md5
rename to setup/inc/sql/osTicket-mysql.sql.md5
diff --git a/setup/inc/sql/osticket-v1.6.sql b/setup/inc/sql/osticket-v1.6.sql
deleted file mode 100644
index 7dcf180bb27f53f9a1b1a8cccae94604848140d0..0000000000000000000000000000000000000000
--- a/setup/inc/sql/osticket-v1.6.sql
+++ /dev/null
@@ -1,509 +0,0 @@
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%api_key`;
-CREATE TABLE `%TABLE_PREFIX%api_key` (
- `id` int(10) unsigned NOT NULL auto_increment,
- `isactive` tinyint(1) NOT NULL default '1',
- `ipaddr` varchar(16) NOT NULL,
- `apikey` varchar(255) NOT NULL,
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
- UNIQUE KEY `ipaddr` (`ipaddr`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%api_key` (`id`, `isactive`, `ipaddr`, `apikey`, `updated`, `created`) VALUES (1, 1, '192.168.1.5', 'siri!', NOW(), NOW());
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%config`;
-CREATE TABLE `%TABLE_PREFIX%config` (
- `id` tinyint(1) unsigned NOT NULL auto_increment,
- `isonline` tinyint(1) unsigned NOT NULL default '0',
- `timezone_offset` float(3,1) NOT NULL default '0.0',
- `enable_daylight_saving` tinyint(1) unsigned NOT NULL default '0',
- `staff_ip_binding` tinyint(1) unsigned NOT NULL default '1',
- `staff_max_logins` tinyint(3) unsigned NOT NULL default '4',
- `staff_login_timeout` int(10) unsigned NOT NULL default '2',
- `staff_session_timeout` int(10) unsigned NOT NULL default '30',
- `client_max_logins` tinyint(3) unsigned NOT NULL default '4',
- `client_login_timeout` int(10) unsigned NOT NULL default '2',
- `client_session_timeout` int(10) unsigned NOT NULL default '30',
- `max_page_size` tinyint(3) unsigned NOT NULL default '25',
- `max_open_tickets` tinyint(3) unsigned NOT NULL default '0',
- `max_file_size` int(11) unsigned NOT NULL default '1048576',
- `autolock_minutes` tinyint(3) unsigned NOT NULL default '3',
- `overdue_grace_period` int(10) unsigned NOT NULL default '0',
- `alert_email_id` tinyint(4) unsigned NOT NULL default '0',
- `default_email_id` tinyint(4) unsigned NOT NULL default '0',
- `default_dept_id` tinyint(3) unsigned NOT NULL default '0',
- `default_priority_id` tinyint(2) unsigned NOT NULL default '2',
- `default_template_id` tinyint(4) unsigned NOT NULL default '1',
- `default_smtp_id` tinyint(4) unsigned NOT NULL default '0',
- `spoof_default_smtp` tinyint(1) unsigned NOT NULL default '0',
- `clickable_urls` tinyint(1) unsigned NOT NULL default '1',
- `allow_priority_change` tinyint(1) unsigned NOT NULL default '0',
- `use_email_priority` tinyint(1) unsigned NOT NULL default '0',
- `enable_captcha` tinyint(1) unsigned NOT NULL default '0',
- `enable_auto_cron` tinyint(1) unsigned NOT NULL default '0',
- `enable_mail_fetch` tinyint(1) unsigned NOT NULL default '0',
- `enable_email_piping` tinyint(1) unsigned NOT NULL default '0',
- `send_sql_errors` tinyint(1) unsigned NOT NULL default '1',
- `send_mailparse_errors` tinyint(1) unsigned NOT NULL default '1',
- `send_login_errors` tinyint(1) unsigned NOT NULL default '1',
- `save_email_headers` tinyint(1) unsigned NOT NULL default '1',
- `strip_quoted_reply` tinyint(1) unsigned NOT NULL default '1',
- `log_ticket_activity` tinyint(1) unsigned NOT NULL default '1',
- `ticket_autoresponder` tinyint(1) unsigned NOT NULL default '0',
- `message_autoresponder` tinyint(1) unsigned NOT NULL default '0',
- `ticket_notice_active` tinyint(1) unsigned NOT NULL default '0',
- `ticket_alert_active` tinyint(1) unsigned NOT NULL default '0',
- `ticket_alert_admin` tinyint(1) unsigned NOT NULL default '1',
- `ticket_alert_dept_manager` tinyint(1) unsigned NOT NULL default '1',
- `ticket_alert_dept_members` tinyint(1) unsigned NOT NULL default '0',
- `message_alert_active` tinyint(1) unsigned NOT NULL default '0',
- `message_alert_laststaff` tinyint(1) unsigned NOT NULL default '1',
- `message_alert_assigned` tinyint(1) unsigned NOT NULL default '1',
- `message_alert_dept_manager` tinyint(1) unsigned NOT NULL default '0',
- `note_alert_active` tinyint(1) unsigned NOT NULL default '0',
- `note_alert_laststaff` tinyint(1) unsigned NOT NULL default '1',
- `note_alert_assigned` tinyint(1) unsigned NOT NULL default '1',
- `note_alert_dept_manager` tinyint(1) unsigned NOT NULL default '0',
- `overdue_alert_active` tinyint(1) unsigned NOT NULL default '0',
- `overdue_alert_assigned` tinyint(1) unsigned NOT NULL default '1',
- `overdue_alert_dept_manager` tinyint(1) unsigned NOT NULL default '1',
- `overdue_alert_dept_members` tinyint(1) unsigned NOT NULL default '0',
- `auto_assign_reopened_tickets` tinyint(1) unsigned NOT NULL default '1',
- `show_assigned_tickets` tinyint(1) unsigned NOT NULL default '0',
- `show_answered_tickets` tinyint(1) NOT NULL default '0',
- `hide_staff_name` tinyint(1) unsigned NOT NULL default '0',
- `overlimit_notice_active` tinyint(1) unsigned NOT NULL default '0',
- `email_attachments` tinyint(1) unsigned NOT NULL default '1',
- `allow_attachments` tinyint(1) unsigned NOT NULL default '0',
- `allow_email_attachments` tinyint(1) unsigned NOT NULL default '0',
- `allow_online_attachments` tinyint(1) unsigned NOT NULL default '0',
- `allow_online_attachments_onlogin` tinyint(1) unsigned NOT NULL default '0',
- `random_ticket_ids` tinyint(1) unsigned NOT NULL default '1',
- `log_level` tinyint(1) unsigned NOT NULL default '2',
- `log_graceperiod` int(10) unsigned NOT NULL default '12',
- `upload_dir` varchar(255) NOT NULL default '',
- `allowed_filetypes` varchar(255) NOT NULL default '.doc, .pdf',
- `time_format` varchar(32) NOT NULL default ' h:i A',
- `date_format` varchar(32) NOT NULL default 'm/d/Y',
- `datetime_format` varchar(60) NOT NULL default 'm/d/Y g:i a',
- `daydatetime_format` varchar(60) NOT NULL default 'D, M j Y g:ia',
- `reply_separator` varchar(60) NOT NULL default '-- do not edit --',
- `admin_email` varchar(125) NOT NULL default '',
- `helpdesk_title` varchar(255) NOT NULL default 'osTicket Support Ticket System',
- `helpdesk_url` varchar(255) NOT NULL default '',
- `api_passphrase` varchar(125) NOT NULL default '',
- `ostversion` varchar(16) NOT NULL default '',
- `updated` timestamp NOT NULL default CURRENT_TIMESTAMP,
- PRIMARY KEY (`id`),
- KEY `isoffline` (`isonline`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%department`;
-CREATE TABLE `%TABLE_PREFIX%department` (
- `dept_id` int(11) unsigned NOT NULL auto_increment,
- `tpl_id` int(10) unsigned NOT NULL default '0',
- `email_id` int(10) unsigned NOT NULL default '0',
- `autoresp_email_id` int(10) unsigned NOT NULL default '0',
- `manager_id` int(10) unsigned NOT NULL default '0',
- `dept_name` varchar(32) NOT NULL default '',
- `dept_signature` tinytext NOT NULL,
- `ispublic` tinyint(1) unsigned NOT NULL default '1',
- `ticket_auto_response` tinyint(1) NOT NULL default '1',
- `message_auto_response` tinyint(1) NOT NULL default '0',
- `can_append_signature` tinyint(1) NOT NULL default '1',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`dept_id`),
- UNIQUE KEY `dept_name` (`dept_name`),
- KEY `manager_id` (`manager_id`),
- KEY `autoresp_email_id` (`autoresp_email_id`),
- KEY `tpl_id` (`tpl_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%department` (`dept_id`, `tpl_id`, `email_id`, `autoresp_email_id`, `manager_id`, `dept_name`, `dept_signature`, `ispublic`, `ticket_auto_response`, `message_auto_response`, `can_append_signature`, `updated`, `created`) VALUES
-(1, 0, 1, 0, 0, 'Support', 'Support Dept', 1, 1, 1, 1, NOW(), NOW()),
-(2, 0, 1, 0, 0, 'Billing', 'Billing Dept', 1, 1, 1, 1, NOW(), NOW());
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%email`;
-CREATE TABLE `%TABLE_PREFIX%email` (
- `email_id` int(11) unsigned NOT NULL auto_increment,
- `noautoresp` tinyint(1) unsigned NOT NULL default '0',
- `priority_id` tinyint(3) unsigned NOT NULL default '2',
- `dept_id` tinyint(3) unsigned NOT NULL default '0',
- `email` varchar(125) NOT NULL default '',
- `name` varchar(32) NOT NULL default '',
- `userid` varchar(125) NOT NULL,
- `userpass` varchar(125) NOT NULL,
- `mail_active` tinyint(1) NOT NULL default '0',
- `mail_host` varchar(125) NOT NULL,
- `mail_protocol` enum('POP','IMAP') NOT NULL default 'POP',
- `mail_encryption` enum('NONE','SSL') NOT NULL,
- `mail_port` int(6) default NULL,
- `mail_fetchfreq` tinyint(3) NOT NULL default '5',
- `mail_fetchmax` tinyint(4) NOT NULL default '30',
- `mail_delete` tinyint(1) NOT NULL default '0',
- `mail_errors` tinyint(3) NOT NULL default '0',
- `mail_lasterror` datetime default NULL,
- `mail_lastfetch` datetime default NULL,
- `smtp_active` tinyint(1) default '0',
- `smtp_host` varchar(125) NOT NULL,
- `smtp_port` int(6) default NULL,
- `smtp_secure` tinyint(1) NOT NULL default '1',
- `smtp_auth` tinyint(1) NOT NULL default '1',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`email_id`),
- UNIQUE KEY `email` (`email`),
- KEY `priority_id` (`priority_id`),
- KEY `dept_id` (`dept_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%email_banlist`;
-CREATE TABLE `%TABLE_PREFIX%email_banlist` (
- `id` int(11) NOT NULL auto_increment,
- `email` varchar(255) NOT NULL default '',
- `submitter` varchar(126) NOT NULL default '',
- `added` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`id`),
- UNIQUE KEY `email` (`email`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%email_banlist` (`id`, `email`, `submitter`, `added`) VALUES
-(1, 'test@example.com', 'System', NOW());
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%email_template`;
-CREATE TABLE `%TABLE_PREFIX%email_template` (
- `tpl_id` int(11) NOT NULL auto_increment,
- `cfg_id` int(10) unsigned NOT NULL default '0',
- `name` varchar(32) NOT NULL default '',
- `notes` text,
- `ticket_autoresp_subj` varchar(255) NOT NULL default '',
- `ticket_autoresp_body` text NOT NULL,
- `ticket_notice_subj` varchar(255) NOT NULL,
- `ticket_notice_body` text NOT NULL,
- `ticket_alert_subj` varchar(255) NOT NULL default '',
- `ticket_alert_body` text NOT NULL,
- `message_autoresp_subj` varchar(255) NOT NULL default '',
- `message_autoresp_body` text NOT NULL,
- `message_alert_subj` varchar(255) NOT NULL default '',
- `message_alert_body` text NOT NULL,
- `note_alert_subj` varchar(255) NOT NULL,
- `note_alert_body` text NOT NULL,
- `assigned_alert_subj` varchar(255) NOT NULL default '',
- `assigned_alert_body` text NOT NULL,
- `ticket_overdue_subj` varchar(255) NOT NULL default '',
- `ticket_overdue_body` text NOT NULL,
- `ticket_overlimit_subj` varchar(255) NOT NULL default '',
- `ticket_overlimit_body` text NOT NULL,
- `ticket_reply_subj` varchar(255) NOT NULL default '',
- `ticket_reply_body` text NOT NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`tpl_id`),
- KEY `cfg_id` (`cfg_id`),
- FULLTEXT KEY `message_subj` (`ticket_reply_subj`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-INSERT INTO `%TABLE_PREFIX%email_template` (`tpl_id`, `cfg_id`, `name`, `notes`, `ticket_autoresp_subj`, `ticket_autoresp_body`, `ticket_notice_subj`, `ticket_notice_body`, `ticket_alert_subj`, `ticket_alert_body`, `message_autoresp_subj`, `message_autoresp_body`, `message_alert_subj`, `message_alert_body`, `note_alert_subj`, `note_alert_body`, `assigned_alert_subj`, `assigned_alert_body`, `ticket_overdue_subj`, `ticket_overdue_body`, `ticket_overlimit_subj`, `ticket_overlimit_body`, `ticket_reply_subj`, `ticket_reply_body`, `created`, `updated`) VALUES
-(1, 1, 'osTicket Default Template', 'Default osTicket templates', 'Support Ticket Opened [#%ticket]', '%name,\r\n\r\nA request for support has been created and assigned ticket #%ticket. A representative will follow-up with you as soon as possible.\r\n\r\nYou can view this ticket''s progress online here: %url/view.php?e=%email&t=%ticket.\r\n\r\nIf you wish to send additional comments or information regarding this issue, please don''t open a new ticket. Simply login using the link above and update the ticket.\r\n\r\n%signature', '[#%ticket] %subject', '%name,\r\n\r\nOur customer care team has created a ticket, #%ticket on your behalf, with the following message.\r\n\r\n%message\r\n\r\nIf you wish to provide additional comments or information regarding this issue, please don''t open a new ticket. You can update or view this ticket''s progress online here: %url/view.php?e=%email&t=%ticket.\r\n\r\n%signature', 'New Ticket Alert', '%staff,\r\n\r\nNew ticket #%ticket created.\r\n-------------------\r\nName: %name\r\nEmail: %email\r\nDept: %dept\r\n\r\n%message\r\n-------------------\r\n\r\nTo view/respond to the ticket, please login to the support ticket system.\r\n\r\n- Your friendly Customer Support System - powered by osTicket.', '[#%ticket] Message Added', '%name,\r\n\r\nYour reply to support request #%ticket has been noted.\r\n\r\nYou can view this support request progress online here: %url/view.php?e=%email&t=%ticket.\r\n\r\n%signature', 'New Message Alert', '%staff,\r\n\r\nNew message appended to ticket #%ticket\r\n\r\n----------------------\r\nName: %name\r\nEmail: %email\r\nDept: %dept\r\n\r\n%message\r\n-------------------\r\n\r\nTo view/respond to the ticket, please login to the support ticket system.\r\n\r\n- Your friendly Customer Support System - powered by osTicket.', 'New Internal Note Alert', '%staff,\r\n\r\nInternal note appended to ticket #%ticket\r\n\r\n----------------------\r\nName: %name\r\n\r\n%note\r\n-------------------\r\n\r\nTo view/respond to the ticket, please login to the support ticket system.\r\n\r\n- Your friendly Customer Support System - powered by osTicket.', 'Ticket #%ticket Assigned to you', '%assignee,\r\n\r\n%assigner has assigned ticket #%ticket to you!\r\n\r\n%message\r\n\r\nTo view complete details, simply login to the support system.\r\n\r\n- Your friendly Support Ticket System - powered by osTicket.', 'Stale Ticket Alert', '%staff,\r\n\r\nA ticket, #%ticket assigned to you or in your department is seriously overdue.\r\n\r\n%url/scp/tickets.php?id=%id\r\n\r\nWe should all work hard to guarantee that all tickets are being addressed in a timely manner. Enough baby talk...please address the issue or you will hear from me again.\r\n\r\n\r\n- Your friendly (although with limited patience) Support Ticket System - powered by osTicket.', 'Support Ticket Denied', '%name\r\n\r\nNo support ticket has been created. You''ve exceeded maximum number of open tickets allowed.\r\n\r\nThis is a temporary block. To be able to open another ticket, one of your pending tickets must be closed. To update or add comments to an open ticket simply login using the link below.\r\n\r\n%url/view.php?e=%email\r\n\r\nThank you.\r\n\r\nSupport Ticket System', '[#%ticket] %subject', '%name,\r\n\r\nA customer support staff member has replied to your support request, #%ticket with the following response:\r\n\r\n%response\r\n\r\nWe hope this response has sufficiently answered your questions. If not, please do not send another email. Instead, reply to this email or login to your account for a complete archive of all your support requests and responses.\r\n\r\n%url/view.php?e=%email&t=%ticket\r\n\r\n%signature', NOW(), NOW());
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%groups`;
-CREATE TABLE `%TABLE_PREFIX%groups` (
- `group_id` int(10) unsigned NOT NULL auto_increment,
- `group_enabled` tinyint(1) unsigned NOT NULL default '1',
- `group_name` varchar(50) NOT NULL default '',
- `dept_access` varchar(255) NOT NULL default '',
- `can_create_tickets` tinyint(1) unsigned NOT NULL default '1',
- `can_edit_tickets` tinyint(1) unsigned NOT NULL default '1',
- `can_delete_tickets` tinyint(1) unsigned NOT NULL default '0',
- `can_close_tickets` tinyint(1) unsigned NOT NULL default '0',
- `can_transfer_tickets` tinyint(1) unsigned NOT NULL default '1',
- `can_ban_emails` tinyint(1) unsigned NOT NULL default '0',
- `can_manage_kb` tinyint(1) unsigned NOT NULL default '0',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`group_id`),
- KEY `group_active` (`group_enabled`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%groups` (`group_id`, `group_enabled`, `group_name`, `dept_access`, `can_create_tickets`, `can_edit_tickets`, `can_delete_tickets`, `can_close_tickets`, `can_transfer_tickets`, `can_ban_emails`, `can_manage_kb`, `created`, `updated`) VALUES
-(1, 1, 'Admins', '1', 1, 1, 1, 1, 1, 1, 1, NOW(), NOW()),
-(2, 1, 'Managers', '1', 1, 1, 0, 1, 1, 1, 1, NOW(),NOW()),
-(3, 1, 'Staff', '1', 1, 0, 0, 0, 0, 0, 0, NOW(), NOW());
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%help_topic`;
-CREATE TABLE `%TABLE_PREFIX%help_topic` (
- `topic_id` int(11) unsigned NOT NULL auto_increment,
- `isactive` tinyint(1) unsigned NOT NULL default '1',
- `noautoresp` tinyint(3) unsigned NOT NULL default '0',
- `priority_id` tinyint(3) unsigned NOT NULL default '0',
- `dept_id` tinyint(3) unsigned NOT NULL default '0',
- `topic` varchar(32) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`topic_id`),
- UNIQUE KEY `topic` (`topic`),
- KEY `priority_id` (`priority_id`),
- KEY `dept_id` (`dept_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-INSERT INTO `%TABLE_PREFIX%help_topic` (`topic_id`, `isactive`, `noautoresp`, `priority_id`, `dept_id`, `topic`, `created`, `updated`) VALUES
-(1, 1, 0, 2, 1, 'Support', NOW(), NOW()),
-(2, 1, 0, 3, 1, 'Billing', NOW(), NOW());
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%kb_premade`;
-CREATE TABLE `%TABLE_PREFIX%kb_premade` (
- `premade_id` int(10) unsigned NOT NULL auto_increment,
- `dept_id` int(10) unsigned NOT NULL default '0',
- `isenabled` tinyint(1) unsigned NOT NULL default '1',
- `title` varchar(125) NOT NULL default '',
- `answer` text NOT NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`premade_id`),
- UNIQUE KEY `title_2` (`title`),
- KEY `dept_id` (`dept_id`),
- KEY `active` (`isenabled`),
- FULLTEXT KEY `title` (`title`,`answer`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%kb_premade` (`premade_id`, `dept_id`, `isenabled`, `title`, `answer`, `created`, `updated`) VALUES
-(1, 0, 1, 'What is osTicket (sample)?', '\r\nosTicket is a widely-used open source support ticket system, an attractive alternative to higher-cost and complex customer support systems - simple, lightweight, reliable, open source, web-based and easy to setup and use.', NOW(), NOW()),
-(2, 0, 1, 'Sample (with variables)', '\r\n%name,\r\n\r\nYour ticket #%ticket created on %createdate is in %dept department.\r\n\r\n', NOW(), NOW());
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%staff`;
-CREATE TABLE `%TABLE_PREFIX%staff` (
- `staff_id` int(11) unsigned NOT NULL auto_increment,
- `group_id` int(10) unsigned NOT NULL default '0',
- `dept_id` int(10) unsigned NOT NULL default '0',
- `username` varchar(32) NOT NULL default '',
- `firstname` varchar(32) default NULL,
- `lastname` varchar(32) default NULL,
- `passwd` varchar(128) default NULL,
- `email` varchar(128) default NULL,
- `phone` varchar(24) NOT NULL default '',
- `phone_ext` varchar(6) default NULL,
- `mobile` varchar(24) NOT NULL default '',
- `signature` tinytext NOT NULL,
- `isactive` tinyint(1) NOT NULL default '1',
- `isadmin` tinyint(1) NOT NULL default '0',
- `isvisible` tinyint(1) unsigned NOT NULL default '1',
- `onvacation` tinyint(1) unsigned NOT NULL default '0',
- `daylight_saving` tinyint(1) unsigned NOT NULL default '0',
- `append_signature` tinyint(1) unsigned NOT NULL default '0',
- `change_passwd` tinyint(1) unsigned NOT NULL default '0',
- `timezone_offset` float(3,1) NOT NULL default '0.0',
- `max_page_size` int(11) unsigned NOT NULL default '0',
- `auto_refresh_rate` int(10) unsigned NOT NULL default '0',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `lastlogin` datetime default NULL,
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`staff_id`),
- UNIQUE KEY `username` (`username`),
- KEY `dept_id` (`dept_id`),
- KEY `issuperuser` (`isadmin`),
- KEY `group_id` (`group_id`,`staff_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%syslog`;
-CREATE TABLE `%TABLE_PREFIX%syslog` (
- `log_id` int(11) unsigned NOT NULL auto_increment,
- `log_type` enum('Debug','Warning','Error') NOT NULL,
- `title` varchar(255) NOT NULL,
- `log` text NOT NULL,
- `logger` varchar(64) NOT NULL,
- `ip_address` varchar(16) NOT NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`log_id`),
- KEY `log_type` (`log_type`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket`;
-CREATE TABLE `%TABLE_PREFIX%ticket` (
- `ticket_id` int(11) unsigned NOT NULL auto_increment,
- `ticketID` int(11) unsigned NOT NULL default '0',
- `dept_id` int(10) unsigned NOT NULL default '1',
- `priority_id` int(10) unsigned NOT NULL default '2',
- `topic_id` int(10) unsigned NOT NULL default '0',
- `staff_id` int(10) unsigned NOT NULL default '0',
- `email` varchar(120) NOT NULL default '',
- `name` varchar(32) NOT NULL default '',
- `subject` varchar(64) NOT NULL default '[no subject]',
- `helptopic` varchar(255) default NULL,
- `phone` varchar(16) default NULL,
- `phone_ext` varchar(8) default NULL,
- `ip_address` varchar(16) NOT NULL default '',
- `status` enum('open','closed') NOT NULL default 'open',
- `source` enum('Web','Email','Phone','Other') NOT NULL default 'Other',
- `isoverdue` tinyint(1) unsigned NOT NULL default '0',
- `isanswered` tinyint(1) unsigned NOT NULL default '0',
- `duedate` datetime default NULL,
- `reopened` datetime default NULL,
- `closed` datetime default NULL,
- `lastmessage` datetime default NULL,
- `lastresponse` datetime default NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`ticket_id`),
- UNIQUE KEY `email_extid` (`ticketID`,`email`),
- KEY `dept_id` (`dept_id`),
- KEY `staff_id` (`staff_id`),
- KEY `status` (`status`),
- KEY `priority_id` (`priority_id`),
- KEY `created` (`created`),
- KEY `closed` (`closed`),
- KEY `duedate` (`duedate`),
- KEY `topic_id` (`topic_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_attachment`;
-CREATE TABLE `%TABLE_PREFIX%ticket_attachment` (
- `attach_id` int(11) unsigned NOT NULL auto_increment,
- `ticket_id` int(11) unsigned NOT NULL default '0',
- `ref_id` int(11) unsigned NOT NULL default '0',
- `ref_type` enum('M','R') NOT NULL default 'M',
- `file_size` varchar(32) NOT NULL default '',
- `file_name` varchar(128) NOT NULL default '',
- `file_key` varchar(128) NOT NULL default '',
- `deleted` tinyint(1) unsigned NOT NULL default '0',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime default NULL,
- PRIMARY KEY (`attach_id`),
- KEY `ticket_id` (`ticket_id`),
- KEY `ref_type` (`ref_type`),
- KEY `ref_id` (`ref_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_lock`;
-CREATE TABLE `%TABLE_PREFIX%ticket_lock` (
- `lock_id` int(11) unsigned NOT NULL auto_increment,
- `ticket_id` int(11) unsigned NOT NULL default '0',
- `staff_id` int(10) unsigned NOT NULL default '0',
- `expire` datetime default NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`lock_id`),
- UNIQUE KEY `ticket_id` (`ticket_id`),
- KEY `staff_id` (`staff_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_message`;
-CREATE TABLE `%TABLE_PREFIX%ticket_message` (
- `msg_id` int(11) unsigned NOT NULL auto_increment,
- `ticket_id` int(11) unsigned NOT NULL default '0',
- `messageId` varchar(255) default NULL,
- `message` text NOT NULL,
- `headers` text,
- `source` varchar(16) default NULL,
- `ip_address` varchar(16) default NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime default NULL,
- PRIMARY KEY (`msg_id`),
- KEY `ticket_id` (`ticket_id`),
- KEY `msgId` (`messageId`),
- FULLTEXT KEY `message` (`message`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_note`;
-CREATE TABLE `%TABLE_PREFIX%ticket_note` (
- `note_id` int(11) unsigned NOT NULL auto_increment,
- `ticket_id` int(11) unsigned NOT NULL default '0',
- `staff_id` int(10) unsigned NOT NULL default '0',
- `source` varchar(32) NOT NULL default '',
- `title` varchar(255) NOT NULL default 'Generic Intermal Notes',
- `note` text NOT NULL,
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`note_id`),
- KEY `ticket_id` (`ticket_id`),
- KEY `staff_id` (`staff_id`),
- FULLTEXT KEY `note` (`note`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_priority`;
-CREATE TABLE `%TABLE_PREFIX%ticket_priority` (
- `priority_id` tinyint(4) NOT NULL auto_increment,
- `priority` varchar(60) NOT NULL default '',
- `priority_desc` varchar(30) NOT NULL default '',
- `priority_color` varchar(7) NOT NULL default '',
- `priority_urgency` tinyint(1) unsigned NOT NULL default '0',
- `ispublic` tinyint(1) NOT NULL default '1',
- PRIMARY KEY (`priority_id`),
- UNIQUE KEY `priority` (`priority`),
- KEY `priority_urgency` (`priority_urgency`),
- KEY `ispublic` (`ispublic`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%ticket_priority` (`priority_id`, `priority`, `priority_desc`, `priority_color`, `priority_urgency`, `ispublic`) VALUES
-(1, 'low', 'Low', '#DDFFDD', 4, 1),
-(2, 'normal', 'Normal', '#FFFFF0', 3, 1),
-(3, 'high', 'High', '#FEE7E7', 2, 1),
-(4, 'emergency', 'Emergency', '#FEE7E7', 1, 0);
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%ticket_response`;
-CREATE TABLE `%TABLE_PREFIX%ticket_response` (
- `response_id` int(11) unsigned NOT NULL auto_increment,
- `msg_id` int(11) unsigned NOT NULL default '0',
- `ticket_id` int(11) unsigned NOT NULL default '0',
- `staff_id` int(11) unsigned NOT NULL default '0',
- `staff_name` varchar(32) NOT NULL default '',
- `response` text NOT NULL,
- `ip_address` varchar(16) NOT NULL default '',
- `created` datetime NOT NULL default '0000-00-00 00:00:00',
- `updated` datetime NOT NULL default '0000-00-00 00:00:00',
- PRIMARY KEY (`response_id`),
- KEY `ticket_id` (`ticket_id`),
- KEY `msg_id` (`msg_id`),
- KEY `staff_id` (`staff_id`),
- FULLTEXT KEY `response` (`response`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-DROP TABLE IF EXISTS `%TABLE_PREFIX%timezone`;
-CREATE TABLE `%TABLE_PREFIX%timezone` (
- `id` int(11) unsigned NOT NULL auto_increment,
- `offset` float(3,1) NOT NULL default '0.0',
- `timezone` varchar(255) NOT NULL default '',
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-INSERT INTO `%TABLE_PREFIX%timezone` (`id`, `offset`, `timezone`) VALUES
-(1, -12.0, 'Eniwetok, Kwajalein'),
-(2, -11.0, 'Midway Island, Samoa'),
-(3, -10.0, 'Hawaii'),
-(4, -9.0, 'Alaska'),
-(5, -8.0, 'Pacific Time (US & Canada)'),
-(6, -7.0, 'Mountain Time (US & Canada)'),
-(7, -6.0, 'Central Time (US & Canada), Mexico City'),
-(8, -5.0, 'Eastern Time (US & Canada), Bogota, Lima'),
-(9, -4.0, 'Atlantic Time (Canada), Caracas, La Paz'),
-(10, -3.5, 'Newfoundland'),
-(11, -3.0, 'Brazil, Buenos Aires, Georgetown'),
-(12, -2.0, 'Mid-Atlantic'),
-(13, -1.0, 'Azores, Cape Verde Islands'),
-(14, 0.0, 'Western Europe Time, London, Lisbon, Casablanca'),
-(15, 1.0, 'Brussels, Copenhagen, Madrid, Paris'),
-(16, 2.0, 'Kaliningrad, South Africa'),
-(17, 3.0, 'Baghdad, Riyadh, Moscow, St. Petersburg'),
-(18, 3.5, 'Tehran'),
-(19, 4.0, 'Abu Dhabi, Muscat, Baku, Tbilisi'),
-(20, 4.5, 'Kabul'),
-(21, 5.0, 'Ekaterinburg, Islamabad, Karachi, Tashkent'),
-(22, 5.5, 'Bombay, Calcutta, Madras, New Delhi'),
-(23, 6.0, 'Almaty, Dhaka, Colombo'),
-(24, 7.0, 'Bangkok, Hanoi, Jakarta'),
-(25, 8.0, 'Beijing, Perth, Singapore, Hong Kong'),
-(26, 9.0, 'Tokyo, Seoul, Osaka, Sapporo, Yakutsk'),
-(27, 9.5, 'Adelaide, Darwin'),
-(28, 10.0, 'Eastern Australia, Guam, Vladivostok'),
-(29, 11.0, 'Magadan, Solomon Islands, New Caledonia'),
-(30, 12.0, 'Auckland, Wellington, Fiji, Kamchatka');
diff --git a/setup/inc/sql/v1.7-cleanup-mysql.sql b/setup/inc/sql/v1.7-cleanup-mysql.sql
deleted file mode 100644
index 6464a100101f330cc8b3425adbd27104721ac632..0000000000000000000000000000000000000000
--- a/setup/inc/sql/v1.7-cleanup-mysql.sql
+++ /dev/null
@@ -1,23 +0,0 @@
--- Drop fields we no longer need in the reference table.
-ALTER TABLE `%TABLE_PREFIX%ticket_attachment`
- DROP `file_size`,
- DROP `file_name`,
- DROP `file_key`,
- DROP `updated`,
- DROP `isdeleted`;
-
--- Drop fields we no longer need in config table.
-ALTER TABLE `%TABLE_PREFIX%config`
- DROP `api_passphrase`;
-
--- Drop fields we no longer need in staff table.
-ALTER TABLE `%TABLE_PREFIX%staff`
- DROP `append_signature`,
- DROP `timezone_offset`;
-
--- Drop fields we no longer need in department table.
-ALTER TABLE `%TABLE_PREFIX%department`
- DROP `can_append_signature`;
-
--- Banlist table has been migrated to the email_filter_rule table
-DROP TABLE `%TABLE_PREFIX%email_banlist`;