From dcd21cd760bf5685e92885f36b2bd5d99e527e6a Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Sun, 22 Mar 2015 19:51:03 -0400 Subject: [PATCH] Fixes #180 use the verification table, update stage_tickets table to match tickets table --- inc/posting_functions.inc.php | 5 +++-- install/mods-for-hesk/sql/installSql.php | 24 +++++++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/inc/posting_functions.inc.php b/inc/posting_functions.inc.php index 682e83a4..c1b334c2 100644 --- a/inc/posting_functions.inc.php +++ b/inc/posting_functions.inc.php @@ -37,7 +37,7 @@ if (!defined('IN_SCRIPT')) {die('Invalid attempt');} /*** FUNCTIONS ***/ -function hesk_newTicket($ticket) +function hesk_newTicket($ticket, $isVerified = true) { global $hesk_settings, $hesklang, $hesk_db_link; @@ -52,10 +52,11 @@ function hesk_newTicket($ticket) $defaultNewTicketRs = hesk_dbQuery("SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsNewTicketStatus` = 1"); $defaultNewTicket = hesk_dbFetchAssoc($defaultNewTicketRs); $ticket['status'] = $defaultNewTicket['ID']; + $tableName = $isVerified ? 'tickets' : 'stage_tickets'; // Insert ticket into database hesk_dbQuery(" - INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` + INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix']).$tableName."` ( `trackid`, `name`, diff --git a/install/mods-for-hesk/sql/installSql.php b/install/mods-for-hesk/sql/installSql.php index d2aa291f..d631c8b7 100644 --- a/install/mods-for-hesk/sql/installSql.php +++ b/install/mods-for-hesk/sql/installSql.php @@ -356,4 +356,26 @@ function execute210FileUpdate() { return file_put_contents(HESK_PATH.'modsForHesk_settings.inc.php', $file); } -// END Version 2.1.0 \ No newline at end of file +// END Version 2.1.0 + +// BEGIN Version 2.1.1 +function execute211Scripts() { + global $hesk_settings; + + hesk_dbConnect(); + executeQuery("ALTER IGNORE TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."stage_tickets` CHANGE `dt` `dt` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00:00'"); + executeQuery("ALTER TABLE `".hesk_dbEscape($hesk_settings['db_pfix'])."stage_tickets` + CHANGE `email` `email` VARCHAR( 1000 ) NOT NULL DEFAULT '', + CHANGE `ip` `ip` VARCHAR(45) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL DEFAULT '', + ADD `firstreply` TIMESTAMP NULL DEFAULT NULL AFTER `lastchange`, + ADD `closedat` TIMESTAMP NULL DEFAULT NULL AFTER `firstreply`, + ADD `articles` VARCHAR(255) NULL DEFAULT NULL AFTER `closedat`, + ADD `openedby` MEDIUMINT(8) DEFAULT '0' AFTER `status`, + ADD `firstreplyby` SMALLINT(5) UNSIGNED NULL DEFAULT NULL AFTER `openedby`, + ADD `closedby` MEDIUMINT(8) NULL DEFAULT NULL AFTER `firstreplyby`, + ADD `replies` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `closedby`, + ADD `staffreplies` SMALLINT( 5 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `replies`, + ADD INDEX ( `openedby` , `firstreplyby` , `closedby` ), + ADD INDEX(`dt`)"); + executeQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."settings` SET `Value` = '2.1.1' WHERE `Key` = 'modsForHeskVersion'"); +} \ No newline at end of file