Reduce dependency on php-assisted upgrade from 1.6-rc*

include/upgrader/patches/98ae1ed2-e342f869.cleanup.sql

+ALTER TABLE `%TABLE_PREFIX%department` DROP `noreply_autoresp`;
+
+ALTER TABLE `%TABLE_PREFIX%config`
+    DROP `noreply_email`,
+    DROP `alert_email`,
+    DROP `api_whitelist`;
+
+-- %email_pop3 migrated to %email table
+TRUNCATE TABLE `%TABLE_PREFIX%email_pop3`;
+DROP TABLE `%TABLE_PREFIX%email_pop3`;

include/upgrader/patches/98ae1ed2-e342f869.patch.sql

@@ -25,6 +25,35 @@ ALTER TABLE `%TABLE_PREFIX%email`
     ADD `smtp_port` INT( 6 ) NULL AFTER `smtp_host` ,
     ADD `smtp_auth` TINYINT( 1 ) NOT NULL DEFAULT '1' AFTER `smtp_port` ;
 
+-- Transfer old POP3 settings to "new" email table
+REPLACE INTO `%TABLE_PREFIX%email` T1 (`updated`, `mail_protocol`,
+    `mail_encryption`, `mail_port`, `mail_active`, `mail_host`,
+    `mail_fetchfreq`, `mail_delete`, `userid`, `userpass`)
+    SELECT NOW(), 'POP', 'NONE', 110, 0, `pophost`, `fetchfreq`,
+        `delete_msgs`, `popuser`, `poppasswd`
+    FROM `%TABLE_PREFIX%email_pop3` T2
+    WHERE T1.`email_id` = T2.`email_id`;
+
+-- Transfer alert email configuration
+INSERT INTO `%TABLE_PREFIX%email` (`created`, `updated`, `priority_id`,
+    `dept_id`, `name`, `email`)
+    SELECT NOW(), NOW(), 2, COALESCE(`default_dept`, 1), 'osTicket Alerts',
+        `alert_email`
+    FROM `%TABLE_PREFIX%config` WHERE `id`=1;
+
+UPDATE `%TABLE_PREFIX%config` SET `alert_email_id` = last_insert_id()
+    WHERE id=1;
+
+-- Transfer no-reply email configuration
+INSERT INTO `%TABLE_PREFIX%email` (`created`, `updated`, `priority_id`,
+    `dept_id`, `name`, `email`)
+    SELECT NOW(), NOW(), 2, COALESCE(`default_dept`, 1), 'No Reply',
+        `noreply_email`
+    FROM `%TABLE_PREFIX%config` WHERE `id`=1;
+
+UPDATE `%TABLE_PREFIX%config` SET `autoresp_email_id` = last_insert_id()
+    WHERE id=1;
+
 ALTER TABLE `%TABLE_PREFIX%groups` ADD `can_edit_tickets` TINYINT UNSIGNED NOT NULL DEFAULT '0' AFTER `dept_access` ;
 
 UPDATE `%TABLE_PREFIX%groups`  SET `can_edit_tickets`=1 WHERE `can_delete_tickets`=1;
@@ -44,6 +73,15 @@ ALTER TABLE `%TABLE_PREFIX%email_template`
 UPDATE `%TABLE_PREFIX%email_template`  SET  `note_alert_subj` = 'New Internal Note Alert',
        `note_alert_body` = '%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\nYour friendly,\r\n\r\nCustomer Support System - powered by osTicket.';
 
+-- Update path and variables on email templates
+UPDATE `%TABLE_PREFIX%email_template`
+    SET `ticket_autoresp_body` = REPLACE(`ticket_autoresp_body`, 'view.php', 'ticket.php'),
+        `message_autoresp_body` = REPLACE(`message_autoresp_body`, 'view.php', 'ticket.php'),
+        `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, 'view.php', 'ticket.php'),
+        `ticket_reply_body` = REPLACE(
+                REPLACE(`ticket_reply_body`, 'view.php', 'ticket.php'),
+            '%message', '%response');
+
 ALTER TABLE `%TABLE_PREFIX%ticket_message` 
     ADD `messageId` VARCHAR( 255 ) NULL AFTER `ticket_id`,
     ADD INDEX ( `messageId` ) ;

include/upgrader/patches/e342f869-c00511c7.patch.sql

@@ -32,6 +32,14 @@ ALTER TABLE `%TABLE_PREFIX%email_template`
     ADD `ticket_notice_subj` VARCHAR( 255 ) NOT NULL AFTER `ticket_autoresp_body` ,
     ADD `ticket_notice_body` TEXT NOT NULL AFTER `ticket_notice_subj`;
 
+UPDATE `%TABLE_PREFIX%email_template` SET updated=NOW(),
+    `ticket_notice_subj` = '[#%ticket] %subject',
+    `ticket_notice_body` = '%name,\r\n\r\nOur customer care team personnel 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';
+
+UPDATE `%TABLE_PREFIX%email_template`
+    SET `ticket_overlimit_subj` = REPLACE(`ticket_overlimit_subj`, '%id', '%ticket'),
+        `ticket_overlimit_body` = REPLACE(`ticket_overlimit_body`, '%id', '%ticket');
+
 INSERT INTO `%TABLE_PREFIX%kb_premade` (`premade_id`, `dept_id`, `isenabled`, `title`, `answer`, `created`, `updated`) 
     VALUES ('', 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());