Merge branch 'hesk-2-6-7-update' into 'master'
Hesk 2.6.7 update See merge request !2
This commit is contained in:
commit
c3bb97eead
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.5 from 28th August 2015
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -476,7 +476,7 @@ function mail_list_messages()
|
||||
|
||||
$maxresults = 30;
|
||||
|
||||
$tmp = intval(hesk_POST('page', 1));
|
||||
$tmp = intval(hesk_GET('page', 1));
|
||||
$page = ($tmp > 1) ? $tmp : 1;
|
||||
|
||||
/* List of private messages */
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -137,7 +137,7 @@ if (hesk_dbAffectedRows() != 1) {
|
||||
|
||||
// Show success message
|
||||
if ($status != $closedStatus) {
|
||||
hesk_process_messages($hesklang['wrepo'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'NOTICE');
|
||||
hesk_process_messages($hesklang['wrepo'],'ticket.php','NOTICE');
|
||||
} else {
|
||||
hesk_process_messages($hesklang['your_ticket_been'] . ' ' . $action, 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'SUCCESS');
|
||||
hesk_process_messages($hesklang['your_ticket_been'].' '.$action,'ticket.php','SUCCESS');
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,6 +1,6 @@
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -166,6 +166,11 @@ function hesk_utf8_urldecode($in)
|
||||
return hesk_html_entity_decode($in);
|
||||
} // END hesk_utf8_urldecode
|
||||
|
||||
function hesk_SESSION($in, $default = '')
|
||||
{
|
||||
return isset($_SESSION[$in]) && ! is_array($_SESSION[$in]) ? $_SESSION[$in] : $default;
|
||||
} // END hesk_SESSION();
|
||||
|
||||
|
||||
function hesk_COOKIE($in, $default = '')
|
||||
{
|
||||
@ -243,6 +248,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
|
||||
if (!$hesk_settings['email_view_ticket']) {
|
||||
$hesk_settings['e_param'] = '';
|
||||
$hesk_settings['e_query'] = '';
|
||||
$hesk_settings['e_email'] = '';
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -253,6 +259,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
|
||||
if ($my_email) {
|
||||
$hesk_settings['e_param'] = '&e=' . rawurlencode($my_email);
|
||||
$hesk_settings['e_query'] = '&e=' . rawurlencode($my_email);
|
||||
$hesk_settings['e_email'] = $my_email;
|
||||
} else {
|
||||
$my_email = hesk_getCustomerEmail();
|
||||
}
|
||||
@ -292,7 +299,7 @@ function hesk_verifyEmailMatch($trackingID, $my_email = 0, $ticket_email = 0, $e
|
||||
} // END hesk_verifyEmailMatch()
|
||||
|
||||
|
||||
function hesk_getCustomerEmail($can_remember = 0)
|
||||
function hesk_getCustomerEmail($can_remember = 0, $field = '')
|
||||
{
|
||||
global $hesk_settings, $hesklang;
|
||||
|
||||
@ -300,6 +307,7 @@ function hesk_getCustomerEmail($can_remember = 0)
|
||||
if (!$hesk_settings['email_view_ticket']) {
|
||||
$hesk_settings['e_param'] = '';
|
||||
$hesk_settings['e_query'] = '';
|
||||
$hesk_settings['e_email'] = '';
|
||||
return '';
|
||||
}
|
||||
|
||||
@ -310,11 +318,17 @@ function hesk_getCustomerEmail($can_remember = 0)
|
||||
|
||||
$my_email = '';
|
||||
|
||||
/* Is email in session? */
|
||||
if ( strlen($field) && isset($_SESSION[$field]) )
|
||||
{
|
||||
$my_email = hesk_validateEmail($_SESSION[$field], 'ERR', 0);
|
||||
}
|
||||
|
||||
/* Is email in query string? */
|
||||
if (isset($_GET['e']) || isset($_POST['e'])) {
|
||||
$my_email = hesk_validateEmail(hesk_REQUEST('e'), 'ERR', 0);
|
||||
} /* Is email in cookie? */
|
||||
elseif (isset($_COOKIE['hesk_myemail'])) {
|
||||
elseif ( isset($_GET['e']) || isset($_POST['e']) ) {
|
||||
$my_email = hesk_validateEmail(hesk_COOKIE('hesk_myemail'), 'ERR', 0);
|
||||
if ($can_remember && $my_email) {
|
||||
$do_remember = ' checked="checked" ';
|
||||
@ -323,6 +337,7 @@ function hesk_getCustomerEmail($can_remember = 0)
|
||||
|
||||
$hesk_settings['e_param'] = '&e=' . rawurlencode($my_email);
|
||||
$hesk_settings['e_query'] = '&e=' . rawurlencode($my_email);
|
||||
$hesk_settings['e_email'] = $my_email;
|
||||
|
||||
return $my_email;
|
||||
|
||||
@ -412,7 +427,9 @@ function hesk_autoAssignTicket($ticket_category)
|
||||
|
||||
function hesk_cleanID($field = 'track')
|
||||
{
|
||||
if (isset($_GET[$field]) && !is_array($_GET[$field])) {
|
||||
if ( isset($_SESSION[$field]) ) {
|
||||
return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_SESSION[$field])), 0, 12);
|
||||
} elseif ( isset($_GET[$field]) && ! is_array($_GET[$field]) ) {
|
||||
return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_GET[$field])), 0, 12);
|
||||
} elseif (isset($_POST[$field]) && !is_array($_POST[$field])) {
|
||||
return substr(preg_replace('/[^A-Z0-9\-]/', '', strtoupper($_POST[$field])), 0, 12);
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.5 from 28th August 2015
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.5 from 28th August 2015
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
19
print.php
19
print.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -38,9 +38,19 @@ hesk_load_database_functions();
|
||||
|
||||
hesk_session_start();
|
||||
|
||||
// Do we have parameters in query string? If yes, store them in session and redirect
|
||||
if ( isset($_GET['track']) || isset($_GET['e']) )
|
||||
{
|
||||
$_SESSION['p_track'] = hesk_GET('track');
|
||||
$_SESSION['p_email'] = hesk_GET('e');
|
||||
|
||||
header('Location: print.php');
|
||||
die();
|
||||
}
|
||||
|
||||
|
||||
/* Get the tracking ID */
|
||||
$trackingID = hesk_cleanID() or die("$hesklang[int_error]: $hesklang[no_trackID]");
|
||||
$trackingID = hesk_cleanID('p_track') or die("$hesklang[int_error]: $hesklang[no_trackID]");
|
||||
|
||||
/* Connect to database */
|
||||
hesk_dbConnect();
|
||||
@ -52,8 +62,13 @@ if (empty($_SESSION['id'])) {
|
||||
|
||||
// Verify email address match
|
||||
hesk_verifyEmailMatch($trackingID);
|
||||
$my_email = hesk_getCustomerEmail(0, 'p_email');
|
||||
hesk_verifyEmailMatch($trackingID, $my_email);
|
||||
}
|
||||
|
||||
/* Clean ticket parameters from the session data, we don't need them anymore */
|
||||
hesk_cleanSessionVars( array('p_track', 'p_email') );
|
||||
|
||||
/* Get ticket info */
|
||||
$res = hesk_dbQuery("SELECT `t1`.* , `ticketStatus`.`IsClosed` AS `isClosed`, `ticketStatus`.`Key` AS `statusKey`, `t2`.name AS `repliername`
|
||||
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `t1` LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `t2` ON `t1`.`replierid` = `t2`.`id`
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -70,6 +70,10 @@ $trackingID = hesk_cleanID('orig_track') or die($hesklang['int_error'] . ': No o
|
||||
// Email required to view ticket?
|
||||
$my_email = hesk_getCustomerEmail();
|
||||
|
||||
// Setup required session vars
|
||||
$_SESSION['t_track'] = $trackingID;
|
||||
$_SESSION['t_email'] = $my_email;
|
||||
|
||||
// Get message
|
||||
$message = hesk_input(hesk_POST('message'));
|
||||
|
||||
@ -118,7 +122,7 @@ if (count($hesk_error_buffer) != 0) {
|
||||
$hesk_error_buffer = $tmp;
|
||||
|
||||
$hesk_error_buffer = $hesklang['pcer'] . '<br /><br /><ul>' . $hesk_error_buffer . '</ul>';
|
||||
hesk_process_messages($hesk_error_buffer, 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999));
|
||||
hesk_process_messages($hesk_error_buffer,'ticket.php');
|
||||
}
|
||||
|
||||
// Check if this IP is temporarily locked out
|
||||
@ -142,7 +146,7 @@ hesk_verifyEmailMatch($trackingID, $my_email, $ticket['email']);
|
||||
|
||||
/* Ticket locked? */
|
||||
if ($ticket['locked']) {
|
||||
hesk_process_messages($hesklang['tislock2'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999));
|
||||
hesk_process_messages($hesklang['tislock2'],'ticket.php');
|
||||
exit();
|
||||
}
|
||||
|
||||
@ -226,6 +230,5 @@ else {
|
||||
hesk_cleanSessionVars('ticket_message');
|
||||
|
||||
/* Show the ticket and the success message */
|
||||
hesk_process_messages($hesklang['reply_submitted_success'], 'ticket.php?track=' . $trackingID . $hesk_settings['e_param'] . '&Refresh=' . rand(10000, 99999), 'SUCCESS');
|
||||
hesk_process_messages($hesklang['reply_submitted_success'],'ticket.php','SUCCESS');
|
||||
exit();
|
||||
?>
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
|
46
ticket.php
46
ticket.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
/*******************************************************************************
|
||||
* Title: Help Desk Software HESK
|
||||
* Version: 2.6.6 from 2nd February 2016
|
||||
* Version: 2.6.7 from 18th April 2016
|
||||
* Author: Klemen Stirn
|
||||
* Website: http://www.hesk.com
|
||||
********************************************************************************
|
||||
@ -56,21 +56,40 @@ $hesk_error_buffer = array();
|
||||
$do_remember = '';
|
||||
$display = 'none';
|
||||
|
||||
/* Was this accessed by the form or link? */
|
||||
$is_form = isset($_GET['f']) ? 1 : 0;
|
||||
|
||||
/* Get the tracking ID */
|
||||
$trackingID = hesk_cleanID();
|
||||
|
||||
/* Email required to view ticket? */
|
||||
$my_email = hesk_getCustomerEmail(1);
|
||||
|
||||
/* A message from ticket reminder? */
|
||||
if (!empty($_GET['remind'])) {
|
||||
if ( ! empty($_GET['remind']) )
|
||||
{
|
||||
$display = 'block';
|
||||
print_form();
|
||||
}
|
||||
|
||||
// Do we have parameters in query string? If yes, store them in session and redirect
|
||||
if ( isset($_GET['track']) || isset($_GET['e']) || isset($_GET['f']) || isset($_GET['r']) )
|
||||
{
|
||||
$_SESSION['t_track'] = hesk_GET('track');
|
||||
$_SESSION['t_email'] = hesk_getCustomerEmail(1);
|
||||
$_SESSION['t_form'] = hesk_GET('f');
|
||||
$_SESSION['t_remember'] = strlen($do_remember) ? 'Y' : hesk_GET('r');
|
||||
|
||||
header('Location: ticket.php');
|
||||
die();
|
||||
}
|
||||
|
||||
/* Was this accessed by the form or link? */
|
||||
$is_form = hesk_SESSION('t_form');
|
||||
|
||||
/* Get the tracking ID */
|
||||
$trackingID = hesk_SESSION('t_track');
|
||||
|
||||
/* Email required to view ticket? */
|
||||
$my_email = hesk_getCustomerEmail(1, 't_email');
|
||||
|
||||
/* Remember email address? */
|
||||
$do_remember = strlen($do_remember) || strlen(hesk_SESSION('t_remember')) ? ' checked="checked" ' : '';
|
||||
|
||||
/* Clean ticket parameters from the session data, we don't need them anymore */
|
||||
hesk_cleanSessionVars( array('t_track', 't_email', 't_form', 't_remember') );
|
||||
|
||||
/* Any errors? Show the form */
|
||||
if ($is_form) {
|
||||
if (empty($trackingID)) {
|
||||
@ -138,9 +157,8 @@ hesk_cleanBfAttempts();
|
||||
|
||||
/* Remember email address? */
|
||||
if ($is_form) {
|
||||
if (!empty($_GET['r'])) {
|
||||
if ( strlen($do_remember) ) {
|
||||
setcookie('hesk_myemail', $my_email, strtotime('+1 year'));
|
||||
$do_remember = ' checked="checked" ';
|
||||
} elseif (isset($_COOKIE['hesk_myemail'])) {
|
||||
setcookie('hesk_myemail', '');
|
||||
}
|
||||
@ -319,7 +337,7 @@ if (!$show['show']) {
|
||||
<div class="row ticketMessageContainer">
|
||||
<div class="col-md-3 col-xs-12">
|
||||
<div class="ticketName"><?php echo $ticket['name']; ?></div>
|
||||
<div class="ticketEmail"><?php echo $ticket['email']; ?></div>
|
||||
<div class="ticketEmail"><a href="mailto:<?php echo $ticket['email']; ?>"><?php echo $ticket['email']; ?></a></div>
|
||||
</div>
|
||||
<div class="col-md-9 col-xs-12 pushMarginLeft">
|
||||
<div class="ticketMessageTop withBorder">
|
||||
|
Loading…
x
Reference in New Issue
Block a user