From bd115aaccbf868b64aa09852b4e8697719db5830 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Thu, 15 Oct 2015 21:56:25 -0400 Subject: [PATCH] #365 Finish install changes --- install/mods-for-hesk/sql/installSql.php | 17 +++++++++++++---- install/mods-for-hesk/sql/uninstallSql.php | 2 ++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index 48bc8824..a8c41f4f 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -836,11 +836,20 @@ function execute250Scripts() $res = executeQuery("SELECT 1 FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "settings` WHERE `Key` = 'rich_text_for_tickets' AND `Value` = 1"); - // If HTML is enabled, copy the canned responses to the html column. + // If HTML is enabled, copy the canned responses to the html column. Unescape them so they're ready to go for editing. if (hesk_dbNumRows($res) > 0) { - executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `html` = `message`"); - executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` SET `html` = `message`"); + $canned_responses = executeQuery("SELECT `id`, `message` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies`"); + while ($response = hesk_dbFetchAssoc($canned_responses)) { + $message = hesk_html_entity_decode($response['message']); + executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` SET `html` = '" . + hesk_dbEscape($message) . "' WHERE `id` = ".intval($response['id'])); + } + $ticket_templates = executeQuery("SELECT `id`, `message` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates`"); + while ($template = hesk_dbFetchAssoc($ticket_templates)) { + $message = hesk_html_entity_decode($template['message']); + executeQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` SET `html` = '" . + hesk_dbEscape($message) . "' WHERE `id` = ".intval($template['id'])); + } } - } // END Version 2.5.0 \ No newline at end of file diff --git a/install/mods-for-hesk/sql/uninstallSql.php b/install/mods-for-hesk/sql/uninstallSql.php index a330eeef..bc95edb9 100644 --- a/install/mods-for-hesk/sql/uninstallSql.php +++ b/install/mods-for-hesk/sql/uninstallSql.php @@ -81,6 +81,8 @@ function removeOtherColumns() executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` DROP COLUMN `html`"); executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "stage_tickets` DROP COLUMN `html`"); executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "replies` DROP COLUMN `html`"); + executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "std_replies` DROP COLUMN `html`"); + executeQuery("ALTER TABLE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "ticket_templates` DROP COLUMN `html`"); // These queries are ran in case someone used an unfortunate installation they may have not properly cleaned up tables