From 12cc442b6bf9efe194c79e60d55a9bed6b5820a8 Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Mon, 12 Jan 2015 23:16:12 -0500 Subject: [PATCH] #92 Update submit_ticket.php --- submit_ticket.php | 104 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 93 insertions(+), 11 deletions(-) diff --git a/submit_ticket.php b/submit_ticket.php index b1cab6fa..51fd7a32 100644 --- a/submit_ticket.php +++ b/submit_ticket.php @@ -1,7 +1,7 @@ verifyResponse($_SERVER["REMOTE_ADDR"], hesk_POST("g-recaptcha-response") ); + } + + if ($resp != null && $resp->success) + { + $_SESSION['img_verified']=true; + } + else + { + $hesk_error_buffer['mysecnum']=$hesklang['recaptcha_error']; + } + } // Using PHP generated image else { @@ -167,12 +205,39 @@ if ($hesk_settings['confirm_email']) } $tmpvar['category'] = intval( hesk_POST('category') ) or $hesk_error_buffer['category']=$hesklang['sel_app_cat']; -$tmpvar['priority'] = $hesk_settings['cust_urgency'] ? intval( hesk_POST('priority') ) : 3; -// Is priority a valid choice? -if ($tmpvar['priority'] < 1 || $tmpvar['priority'] > 3) +// Do we allow customer to select priority? +if ($hesk_settings['cust_urgency']) { - $hesk_error_buffer['priority'] = $hesklang['sel_app_priority']; + $tmpvar['priority'] = intval( hesk_POST('priority') ); + + // We don't allow customers select "Critical". If priority is not valid set it to "low". + if ($tmpvar['priority'] < 1 || $tmpvar['priority'] > 3) + { + // If we are showing "Click to select" priority needs to be selected + if ($hesk_settings['select_pri']) + { + $tmpvar['priority'] = -1; + $hesk_error_buffer['priority'] = $hesklang['select_priority']; + } + else + { + $tmpvar['priority'] = 3; + } + } +} +// Priority will be selected based on the category selected +else +{ + $res = hesk_dbQuery("SELECT `priority` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE `id`=".intval($tmpvar['category'])); + if ( hesk_dbNumRows($res) == 1 ) + { + $tmpvar['priority'] = intval( hesk_dbResult($res) ); + } + else + { + $tmpvar['priority'] = 3; + } } $tmpvar['subject'] = hesk_input( hesk_POST('subject') ) or $hesk_error_buffer['subject']=$hesklang['enter_ticket_subject']; @@ -223,10 +288,13 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) } $_POST[$k] = ''; } + + $_SESSION["c_$k"]=hesk_POST_array($k); } elseif ($v['req']) { $tmpvar[$k]=hesk_makeURL(nl2br(hesk_input( hesk_POST($k) ))); + $_SESSION["c_$k"]=hesk_POST($k); if (!strlen($tmpvar[$k])) { $hesk_error_buffer[$k]=$hesklang['fill_all'].': '.$v['name']; @@ -247,7 +315,6 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) $tmpvar[$k] = hesk_makeURL(nl2br(hesk_input(hesk_POST($k)))); } } - $_SESSION["c_$k"]=hesk_POST($k); } else { @@ -255,6 +322,12 @@ foreach ($hesk_settings['custom_fields'] as $k=>$v) } } +// Check bans +if ( ! isset($hesk_error_buffer['email']) && hesk_isBannedEmail($tmpvar['email']) || hesk_isBannedIP($_SERVER['REMOTE_ADDR']) ) +{ + hesk_error($hesklang['baned_e']); +} + // Check maximum open tickets limit $below_limit = true; if ($hesk_settings['max_open'] && ! isset($hesk_error_buffer['email']) ) @@ -326,6 +399,12 @@ if (count($hesk_error_buffer)) $tmpvar['message']=hesk_makeURL($tmpvar['message']); $tmpvar['message']=nl2br($tmpvar['message']); +// Track suggested knowledgebase articles +if ($hesk_settings['kb_enable'] && $hesk_settings['kb_recommendanswers'] && isset($_POST['suggested']) && is_array($_POST['suggested']) ) +{ + $tmpvar['articles'] = implode(',', array_unique( array_map('intval', $_POST['suggested']) ) ); +} + // All good now, continue with ticket creation $tmpvar['owner'] = 0; $tmpvar['history'] = sprintf($hesklang['thist15'], hesk_date(), $tmpvar['name']); @@ -378,7 +457,10 @@ if ($createTicket) $ticket = hesk_newTicket($tmpvar); // Notify the customer - hesk_notifyCustomer(); + if ($hesk_settings['notify_new']) + { + hesk_notifyCustomer(); + } // Need to notify staff? // --> From autoassign? @@ -431,9 +513,9 @@ require_once(HESK_PATH . 'inc/header.inc.php'); hesk_show_success( $hesklang['ticket_submitted'] . '

' . - $hesklang['ticket_submitted_success'] . ': ' . $ticket['trackid'] . '

- ' . $hesklang['view_your_ticket'] . '' - + $hesklang['ticket_submitted_success'] . ': ' . $ticket['trackid'] . '

' . + ($hesk_settings['notify_new'] && $hesk_settings['spam_notice'] ? $hesklang['spam_inbox'] . '

' : '') . + '' . $hesklang['view_your_ticket'] . '' ); } else {