From daaaead1f72ffe8c825eab5305c6a6fc56db10db Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 27 Jan 2015 21:22:44 -0500 Subject: [PATCH] #122 Patch up some syntax errors --- admin/admin_reply_ticket.php | 4 ++-- inc/common.inc.php | 2 +- submit_ticket.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/admin_reply_ticket.php b/admin/admin_reply_ticket.php index 2a75272d..3fbb6e8d 100644 --- a/admin/admin_reply_ticket.php +++ b/admin/admin_reply_ticket.php @@ -110,7 +110,7 @@ if (strlen($message)) { /* Get the next open ticket that needs a reply */ $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `owner` IN ('0','".intval($_SESSION['id'])."') - AND " . hesk_myCategories() . " AND `status` IN (SELECT `ID` FROM ".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` + AND " . hesk_myCategories() . " AND `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsNewTicketStatus` = 1 OR `IsCustomerReplyStatus` = 1 OR `IsStaffReopenedStatus` = 1) ORDER BY `owner` DESC, `priority` ASC LIMIT 1"); @@ -394,7 +394,7 @@ if ($_SESSION['afterreply'] == 1) elseif ($_SESSION['afterreply'] == 2) { /* Get the next open ticket that needs a reply */ - $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `owner` IN ('0','".intval($_SESSION['id'])."') AND " . hesk_myCategories() . " AND `status` IN (SELECT `ID` FROM ".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` + $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `owner` IN ('0','".intval($_SESSION['id'])."') AND " . hesk_myCategories() . " AND `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsNewTicketStatus` = 1 OR `IsCustomerReplyStatus` = 1 OR `IsStaffReopenedStatus` = 1) ORDER BY `owner` DESC, `priority` ASC LIMIT 1"); if (hesk_dbNumRows($res) == 1) diff --git a/inc/common.inc.php b/inc/common.inc.php index aae2a1e3..29947b88 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -406,7 +406,7 @@ function hesk_autoAssignTicket($ticket_category) /* Get all possible auto-assign staff, order by number of open tickets */ $res = hesk_dbQuery("SELECT `t1`.`id`,`t1`.`user`,`t1`.`name`, `t1`.`email`, `t1`.`language`, `t1`.`isadmin`, `t1`.`categories`, `t1`.`notify_assigned`, `t1`.`heskprivileges`, - (SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` FORCE KEY (`statuses`) WHERE `owner`=`t1`.`id` AND `status` IN (SELECT `ID` FROM ".hesk_dbEscape($hesk_settings['db_pfix'])."statuse` WHERE `IsClosed` = 0) ) as `open_tickets` + (SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` FORCE KEY (`statuses`) WHERE `owner`=`t1`.`id` AND `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsClosed` = 0) ) as `open_tickets` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` AS `t1` WHERE `t1`.`autoassign`='1' ORDER BY `open_tickets` ASC, RAND()"); diff --git a/submit_ticket.php b/submit_ticket.php index e13f4ba1..cec71ea6 100644 --- a/submit_ticket.php +++ b/submit_ticket.php @@ -332,7 +332,7 @@ if ( ! isset($hesk_error_buffer['email']) && hesk_isBannedEmail($tmpvar['email'] $below_limit = true; if ($hesk_settings['max_open'] && ! isset($hesk_error_buffer['email']) ) { - $res = hesk_dbQuery("SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `status` IN (SELECT `ID` FROM ".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsClosed` = 0) AND " . hesk_dbFormatEmail($tmpvar['email'])); + $res = hesk_dbQuery("SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsClosed` = 0) AND " . hesk_dbFormatEmail($tmpvar['email'])); $num = hesk_dbResult($res); if ($num >= $hesk_settings['max_open'])