data-category-id="">
+
-
+ data-action="generate-link"
+ data-link="">
1) {
if ($j == 1) {
@@ -336,13 +341,13 @@ if (!hesk_SESSION('error')) {
+
@@ -102,8 +107,10 @@ $num = hesk_dbNumRows($result);
unset($_SESSION['canned']['selcat2']);
}
- $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.str_replace("\r\n","\\r\\n' + \r\n'", addslashes($mysaved['message']) )."';\n";
- $javascript_titles.='myTitle['.$mysaved['id'].']=\''.addslashes($mysaved['title'])."';\n";
+ $message_text = $hesk_settings['staff_ticket_formatting'] == 2 ? $mysaved['message_html'] : $mysaved['message'];
+
+ $javascript_messages.='myMsgTxt['.$mysaved['id'].']=\''.preg_replace("/\r?\n|\r/","\\r\\n' + \r\n'", addslashes($message_text) )."';\n";
+ $javascript_titles.='myTitle['.$mysaved['id'].']=\''.preg_replace("/\r?\n|\r/","\\r\\n' + \r\n'", addslashes($mysaved['title']))."';\n";
echo '
@@ -215,12 +222,17 @@ $num = hesk_dbNumRows($result);
-
+
@@ -250,7 +262,12 @@ echo $javascript_messages;
function setMessage(msgid) {
if (document.getElementById) {
- document.getElementById('HeskMsg').innerHTML='
';
+
+ tinymce.get("canned_message").setContent('');
+ tinymce.get("canned_message").execCommand('mceInsertRawHTML', false, myMsgTxt[msgid]);
+
+ document.getElementById('HeskMsg').innerHTML='
';
+
document.getElementById('HeskTitle').innerHTML='
';
} else {
document.form1.msg.value=myMsgTxt[msgid];
@@ -264,11 +281,14 @@ function setMessage(msgid) {
document.getElementsByClassName('template-create')[0].style.display = 'block';
}
-function diplayAddTitle() {
+function displayAddTitle() {
document.form1.msg.value = '';
document.form1.name.value = '';
document.form1.saved_replies.value = 0;
document.form1.a.value = 'new';
+
+ tinymce.get("canned_message").setContent('');
+
document.getElementById('add-title').style.display = 'block';
document.getElementById('edit-title').style.display = 'none';
}
@@ -325,7 +345,31 @@ function edit_saved()
hesk_process_messages($hesk_error_buffer,'manage_ticket_templates.php?saved_replies='.$id);
}
- $result = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."ticket_templates` SET `title`='".hesk_dbEscape($savename)."',`message`='".hesk_dbEscape($msg)."' WHERE `id`='".intval($id)."'");
+ if ($hesk_settings['staff_ticket_formatting'] == 2) {
+ // Decode the message we encoded earlier
+ $msg_html = hesk_html_entity_decode($msg);
+
+ // Clean the HTML code and set the plaintext version
+ require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php');
+ require(HESK_PATH . 'inc/html2text/html2text.php');
+ $purifier = new HeskHTMLPurifier($hesk_settings['cache_dir']);
+ $msg_html = $purifier->heskPurify($msg_html);
+
+ $msg = convert_html_to_text($msg_html);
+ $msg = fix_newlines($msg);
+ // Replace regular newlines with \r\n to match regular plaintext storage... but then get rid of any accidental \r\r\n outputs
+ $msg = str_replace("\n", "\r\n", $msg);
+ $msg = str_replace("\r\r\n", "\r\n", $msg);
+
+ // Re-encode the message
+ $msg = hesk_htmlspecialchars($msg);
+ } else {
+ $msg_html = hesk_makeURL($msg);
+ $msg_html = nl2br($msg_html);
+ }
+
+ $result = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."ticket_templates` SET `title`='".hesk_dbEscape($savename)."',`message`='".hesk_dbEscape($msg)."', `message_html`='".hesk_dbEscape($msg_html)."' WHERE `id`='".intval($id)."'");
+
unset($_SESSION['canned']['what']);
unset($_SESSION['canned']['id']);
@@ -372,12 +416,35 @@ function new_saved()
hesk_process_messages($hesk_error_buffer,'manage_ticket_templates.php');
}
+ if ($hesk_settings['staff_ticket_formatting'] == 2) {
+ // Decode the message we encoded earlier
+ $msg_html = hesk_html_entity_decode($msg);
+
+ // Clean the HTML code and set the plaintext version
+ require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php');
+ require(HESK_PATH . 'inc/html2text/html2text.php');
+ $purifier = new HeskHTMLPurifier($hesk_settings['cache_dir']);
+ $msg_html = $purifier->heskPurify($msg_html);
+
+ $msg = convert_html_to_text($msg_html);
+ $msg = fix_newlines($msg);
+ // Replace regular newlines with \r\n to match regular plaintext storage... but then get rid of any accidental \r\r\n outputs
+ $msg = str_replace("\n", "\r\n", $msg);
+ $msg = str_replace("\r\r\n", "\r\n", $msg);
+
+ // Re-encode the message
+ $msg = hesk_htmlspecialchars($msg);
+ } else {
+ $msg_html = hesk_makeURL($msg);
+ $msg_html = nl2br($msg_html);
+ }
+
/* Get the latest tpl_order */
$result = hesk_dbQuery('SELECT `tpl_order` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'ticket_templates` ORDER BY `tpl_order` DESC LIMIT 1');
$row = hesk_dbFetchRow($result);
$my_order = isset($row[0]) ? intval($row[0]) + 10 : 10;
- hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."ticket_templates` (`title`,`message`,`tpl_order`) VALUES ('".hesk_dbEscape($savename)."','".hesk_dbEscape($msg)."','".intval($my_order)."')");
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."ticket_templates` (`title`,`message`,`message_html`,`tpl_order`) VALUES ('".hesk_dbEscape($savename)."','".hesk_dbEscape($msg)."','".hesk_dbEscape($msg_html)."','".intval($my_order)."')");
unset($_SESSION['canned']['what']);
unset($_SESSION['canned']['name']);
diff --git a/hesk/admin/manage_users.php b/hesk/admin/manage_users.php
index bcc5b7c..ca89a0e 100644
--- a/hesk/admin/manage_users.php
+++ b/hesk/admin/manage_users.php
@@ -96,7 +96,9 @@ $default_userdata = array(
// Notifications
'notify_new_unassigned' => 1,
+ 'notify_overdue_unassigned' => 1,
'notify_new_my' => 1,
+ 'notify_overdue_my' => 1,
'notify_reply_unassigned' => 1,
'notify_reply_my' => 1,
'notify_assigned' => 1,
@@ -226,6 +228,20 @@ if ($hesk_settings['imap'] && hesk_validateEmail($hesk_settings['imap_user'], 'E
}
}
}
+
+// We probably shouldn't have two or more users with the same email address; show a notice if so
+$res = hesk_dbQuery('SELECT `email`, COUNT(*) AS `cnt` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'users` GROUP BY `email` HAVING `cnt` > 1');
+if (hesk_dbNumRows($res) > 0)
+{
+ $emails = array();
+ while ($row = hesk_dbFetchAssoc($res))
+ {
+ $emails[$row['email']] = $row['cnt'];
+ }
+
+ //hesk_show_notice($hesklang['uue'] . '
' . implode('
', array_keys($emails)));
+ hesk_show_notice($hesklang['uue']);
+}
?>
@@ -637,7 +653,9 @@ function new_user()
`notify_customer_reply`,
`show_suggested`,
`notify_new_unassigned`,
+ `notify_overdue_unassigned`,
`notify_new_my`,
+ `notify_overdue_my`,
`notify_reply_unassigned`,
`notify_reply_my`,
`notify_assigned`,
@@ -660,7 +678,9 @@ function new_user()
'".($myuser['notify_customer_reply'])."' ,
'".($myuser['show_suggested'])."' ,
'".($myuser['notify_new_unassigned'])."' ,
+ '".($myuser['notify_overdue_unassigned'])."',
'".($myuser['notify_new_my'])."' ,
+ '".($myuser['notify_overdue_my'])."' ,
'".($myuser['notify_reply_unassigned'])."' ,
'".($myuser['notify_reply_my'])."' ,
'".($myuser['notify_assigned'])."' ,
@@ -750,7 +770,9 @@ function update_user()
`notify_customer_reply`='".($myuser['notify_customer_reply'])."' ,
`show_suggested`='".($myuser['show_suggested'])."' ,
`notify_new_unassigned`='".($myuser['notify_new_unassigned'])."' ,
+ `notify_overdue_unassigned`='".($myuser['notify_overdue_unassigned'])."' ,
`notify_new_my`='".($myuser['notify_new_my'])."' ,
+ `notify_overdue_my`='".($myuser['notify_overdue_my'])."' ,
`notify_reply_unassigned`='".($myuser['notify_reply_unassigned'])."' ,
`notify_reply_my`='".($myuser['notify_reply_my'])."' ,
`notify_assigned`='".($myuser['notify_assigned'])."' ,
@@ -839,6 +861,12 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
}
}
}
+
+ // One needs view tickets permissions in one has reply to permission
+ if (in_array('can_reply_tickets', $myuser['features']))
+ {
+ $myuser['features'][] = 'can_view_tickets';
+ }
}
if (hesk_mb_strlen($myuser['signature'])>1000)
@@ -909,13 +937,15 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
}
/* Notifications */
- $myuser['notify_new_unassigned'] = empty($_POST['notify_new_unassigned']) ? 0 : 1;
- $myuser['notify_new_my'] = empty($_POST['notify_new_my']) ? 0 : 1;
- $myuser['notify_reply_unassigned'] = empty($_POST['notify_reply_unassigned']) ? 0 : 1;
- $myuser['notify_reply_my'] = empty($_POST['notify_reply_my']) ? 0 : 1;
- $myuser['notify_assigned'] = empty($_POST['notify_assigned']) ? 0 : 1;
- $myuser['notify_note'] = empty($_POST['notify_note']) ? 0 : 1;
- $myuser['notify_pm'] = empty($_POST['notify_pm']) ? 0 : 1;
+ $myuser['notify_new_unassigned'] = empty($_POST['notify_new_unassigned']) ? 0 : 1;
+ $myuser['notify_overdue_unassigned'] = empty($_POST['notify_overdue_unassigned']) ? 0 : 1;
+ $myuser['notify_new_my'] = empty($_POST['notify_new_my']) ? 0 : 1;
+ $myuser['notify_overdue_my'] = empty($_POST['notify_overdue_my']) ? 0 : 1;
+ $myuser['notify_reply_unassigned'] = empty($_POST['notify_reply_unassigned']) ? 0 : 1;
+ $myuser['notify_reply_my'] = empty($_POST['notify_reply_my']) ? 0 : 1;
+ $myuser['notify_assigned'] = empty($_POST['notify_assigned']) ? 0 : 1;
+ $myuser['notify_note'] = empty($_POST['notify_note']) ? 0 : 1;
+ $myuser['notify_pm'] = empty($_POST['notify_pm']) ? 0 : 1;
/* Save entered info in session so we don't lose it in case of errors */
$_SESSION['userdata'] = $myuser;
@@ -942,6 +972,12 @@ function hesk_validateUserInfo($pass_required = 1, $redirect_to = './manage_user
$myuser['features'][] = 'can_ban_emails';
}
+ // "can_unban_ips" feature also enables "can_ban_ips"
+ if ( in_array('can_unban_ips', $myuser['features']) && ! in_array('can_ban_ips', $myuser['features']) )
+ {
+ $myuser['features'][] = 'can_ban_ips';
+ }
+
return $myuser;
} // End hesk_validateUserInfo()
@@ -969,6 +1005,9 @@ function remove()
}
/* Un-assign all tickets for this user */
+ // Don't update resolved tickets "Last modified"
+ $res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `owner`=0, `lastchange`=`lastchange` WHERE `owner`='".intval($myuser)."' AND `status` = '3'");
+ // For unresolved tickets, update the "Last modified"
$res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `owner`=0 WHERE `owner`='".intval($myuser)."'");
/* Delete user info */
diff --git a/hesk/admin/module_escalate.php b/hesk/admin/module_escalate.php
new file mode 100644
index 0000000..ed6ac38
--- /dev/null
+++ b/hesk/admin/module_escalate.php
@@ -0,0 +1,76 @@
+HESK Cloud'), ' ', false);
+?>
+
+
+
+
+
+
+
+
HESK Demo'); ?>
+
+
+
+
*
+
+
+ :
+
+
+
+
+
+
:
diff --git a/hesk/admin/password.php b/hesk/admin/password.php
index 561aced..2d9e8bf 100644
--- a/hesk/admin/password.php
+++ b/hesk/admin/password.php
@@ -317,6 +317,11 @@ $login_wrapper = true;
+
$hesklang['low']
);
-$revision = sprintf($hesklang['thist8'],hesk_date(),$options[$priority],$_SESSION['name'].' ('.$_SESSION['user'].')');
+$revision = sprintf($hesklang['thist8'],hesk_date(),$options[$priority],addslashes($_SESSION['name']).' ('.$_SESSION['user'].')');
hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `priority`='{$priority}', `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."'");
if (hesk_dbAffectedRows() != 1)
diff --git a/hesk/admin/profile.php b/hesk/admin/profile.php
index 45ee260..16aa8ad 100644
--- a/hesk/admin/profile.php
+++ b/hesk/admin/profile.php
@@ -313,13 +313,15 @@ function update_profile() {
}
/* Notifications */
- $_SESSION['new']['notify_new_unassigned'] = empty($_POST['notify_new_unassigned']) || ! $can_view_unassigned ? 0 : 1;
- $_SESSION['new']['notify_new_my'] = empty($_POST['notify_new_my']) ? 0 : 1;
- $_SESSION['new']['notify_reply_unassigned'] = empty($_POST['notify_reply_unassigned']) || ! $can_view_unassigned ? 0 : 1;
- $_SESSION['new']['notify_reply_my'] = empty($_POST['notify_reply_my']) ? 0 : 1;
- $_SESSION['new']['notify_assigned'] = empty($_POST['notify_assigned']) ? 0 : 1;
- $_SESSION['new']['notify_note'] = empty($_POST['notify_note']) ? 0 : 1;
- $_SESSION['new']['notify_pm'] = empty($_POST['notify_pm']) ? 0 : 1;
+ $_SESSION['new']['notify_new_unassigned'] = empty($_POST['notify_new_unassigned']) || ! $can_view_unassigned ? 0 : 1;
+ $_SESSION['new']['notify_overdue_unassigned'] = empty($_POST['notify_overdue_unassigned']) || !$can_view_unassigned ? 0 : 1;
+ $_SESSION['new']['notify_new_my'] = empty($_POST['notify_new_my']) ? 0 : 1;
+ $_SESSION['new']['notify_overdue_my'] = empty($_POST['notify_overdue_my']) ? 0 : 1;
+ $_SESSION['new']['notify_reply_unassigned'] = empty($_POST['notify_reply_unassigned']) || ! $can_view_unassigned ? 0 : 1;
+ $_SESSION['new']['notify_reply_my'] = empty($_POST['notify_reply_my']) ? 0 : 1;
+ $_SESSION['new']['notify_assigned'] = empty($_POST['notify_assigned']) ? 0 : 1;
+ $_SESSION['new']['notify_note'] = empty($_POST['notify_note']) ? 0 : 1;
+ $_SESSION['new']['notify_pm'] = empty($_POST['notify_pm']) ? 0 : 1;
/* Any errors? */
if (strlen($hesk_error_buffer))
@@ -348,7 +350,9 @@ function update_profile() {
`notify_customer_reply`='".($_SESSION['new']['notify_customer_reply'])."' ,
`show_suggested`='".($_SESSION['new']['show_suggested'])."' ,
`notify_new_unassigned`='".($_SESSION['new']['notify_new_unassigned'])."' ,
+ `notify_overdue_unassigned`='".($_SESSION['new']['notify_overdue_unassigned'])."' ,
`notify_new_my`='".($_SESSION['new']['notify_new_my'])."' ,
+ `notify_overdue_my`='".($_SESSION['new']['notify_overdue_my'])."' ,
`notify_reply_unassigned`='".($_SESSION['new']['notify_reply_unassigned'])."' ,
`notify_reply_my`='".($_SESSION['new']['notify_reply_my'])."' ,
`notify_assigned`='".($_SESSION['new']['notify_assigned'])."' ,
diff --git a/hesk/admin/resend_notification.php b/hesk/admin/resend_notification.php
index 5aee78d..57d9cef 100644
--- a/hesk/admin/resend_notification.php
+++ b/hesk/admin/resend_notification.php
@@ -92,6 +92,7 @@ $info = array(
'attachments' => $ticket['attachments'],
'dt' => hesk_date($ticket['dt'], true),
'lastchange' => hesk_date($ticket['lastchange'], true),
+'due_date' => hesk_format_due_date($ticket['due_date']),
'id' => $ticket['id'],
'time_worked' => $ticket['time_worked'],
'last_reply_by' => hesk_getReplierName($ticket),
diff --git a/hesk/admin/service_messages.php b/hesk/admin/service_messages.php
index 55347c4..7131bc7 100644
--- a/hesk/admin/service_messages.php
+++ b/hesk/admin/service_messages.php
@@ -253,18 +253,7 @@ $num = hesk_dbNumRows($res);
-
-
>
@@ -289,7 +278,14 @@ if ($hesk_settings['kb_wysiwyg'])
/* Do we have a service message to preview? */
if (isset($_SESSION['preview_sm'])) {
- hesk_service_message($_SESSION['new_sm']);
+ if (isset($_SESSION['new_sm']['message_preview'])) {
+ $tmp = $_SESSION['new_sm']['message'];
+ $_SESSION['new_sm']['message'] = $_SESSION['new_sm']['message_preview'];
+ hesk_service_message($_SESSION['new_sm']);
+ $_SESSION['new_sm']['message'] = $tmp;
+ } else {
+ hesk_service_message($_SESSION['new_sm']);
+ }
}
?>
@@ -435,7 +431,7 @@ function save_sm()
$language = '';
}
$title = hesk_input( hesk_POST('title') ) or $hesk_error_buffer[] = $hesklang['sm_e_title'];
- $message = hesk_getHTML( hesk_POST('message') );
+ $message = $hesk_settings['kb_wysiwyg'] ? hesk_getHTML( hesk_POST('message') ) : nl2br( hesk_input( hesk_POST('message') ) );
// Clean the HTML code
require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php');
@@ -480,7 +476,8 @@ function save_sm()
'type' => $type,
'language' => $language,
'title' => $title,
- 'message' => $message
+ 'message' => hesk_input( hesk_POST('message') ),
+ 'message_preview' => $message
);
header('Location: service_messages.php');
@@ -517,6 +514,20 @@ function edit_sm()
hesk_error($hesklang['sm_not_found']);
}
$sm = hesk_dbFetchAssoc($res);
+
+ // If we're in plain text mode, convert any HTML message safely to text
+ if ( ! $hesk_settings['kb_wysiwyg'])
+ {
+ // Clean the HTML code and set the plaintext version
+ require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php');
+ require(HESK_PATH . 'inc/html2text/html2text.php');
+ $purifier = new HeskHTMLPurifier($hesk_settings['cache_dir']);
+ $sm['message'] = $purifier->heskPurify($sm['message']);
+
+ $sm['message'] = convert_html_to_text($sm['message']);
+ $sm['message'] = fix_newlines($sm['message']);
+ }
+
$sm['message'] = hesk_htmlspecialchars($sm['message']);
$_SESSION['smord'] = $id;
@@ -622,7 +633,7 @@ function new_sm()
$language = '';
}
$title = hesk_input( hesk_POST('title') ) or $hesk_error_buffer[] = $hesklang['sm_e_title'];
- $message = hesk_getHTML( hesk_POST('message') );
+ $message = $hesk_settings['kb_wysiwyg'] ? hesk_getHTML( hesk_POST('message') ) : nl2br( hesk_input( hesk_POST('message') ) );
// Clean the HTML code
require(HESK_PATH . 'inc/htmlpurifier/HeskHTMLPurifier.php');
@@ -662,7 +673,8 @@ function new_sm()
'type' => $type,
'language' => $language,
'title' => $title,
- 'message' => $message,
+ 'message' => hesk_input( hesk_POST('message') ),
+ 'message_preview' => $message
);
header('Location: service_messages.php');
diff --git a/hesk/admin/show_tickets.php b/hesk/admin/show_tickets.php
index 5c814be..19322fb 100644
--- a/hesk/admin/show_tickets.php
+++ b/hesk/admin/show_tickets.php
@@ -46,18 +46,10 @@ hesk_handle_messages();
?>
'. $hesklang['tickets'] .' (%%HESK_TICKET_COUNT%%)
-
- '. $hesklang['arp'] .'
- ';
/* Print the list of tickets */
$is_search = 1;
+$href = 'show_tickets.php';
require_once(HESK_PATH . 'inc/print_tickets.inc.php');
/* Update staff default settings? */
diff --git a/hesk/attachments/.htaccess b/hesk/attachments/.htaccess
new file mode 100644
index 0000000..92e78ba
--- /dev/null
+++ b/hesk/attachments/.htaccess
@@ -0,0 +1,25 @@
+# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from
+# module mod_authz_host to a new module called mod_access_compat (which may be
+# disabled) and a new "Require" syntax has been introduced to mod_authz_core.
+# We could just conditionally provide both versions, but unfortunately Apache
+# does not explicitly tell us its version if the module mod_version is not
+# available. In this case, we check for the availability of module
+# mod_authz_core (which should be on 2.4 or higher only) as a best guess.
+
+
+ Order Allow,Deny
+ Deny from All
+
+ = 2.4>
+ Require all denied
+
+
+
+
+ Order Allow,Deny
+ Deny from All
+
+
+ Require all denied
+
+
diff --git a/hesk/cron/email_overdue_tickets.php b/hesk/cron/email_overdue_tickets.php
new file mode 100644
index 0000000..52aacf2
--- /dev/null
+++ b/hesk/cron/email_overdue_tickets.php
@@ -0,0 +1,147 @@
+#!/usr/bin/php -q
+ 3
+ AND `overdue_email_sent` = '0'";
+
+$successful_emails = 0;
+$failed_emails = 0;
+$rs = hesk_dbQuery($sql);
+$number_of_tickets = hesk_dbNumRows($rs);
+
+
+hesk_overdue_ticket_log(sprintf($hesklang['overdue_ticket_count'], $number_of_tickets));
+
+if (!$number_of_tickets) {
+ exit();
+}
+
+$user_rs = hesk_dbQuery("SELECT `id`, `isadmin`, `categories`, `email`, `name`,
+ CASE WHEN `heskprivileges` LIKE '%can_view_unassigned%' THEN 1 ELSE 0 END AS `can_view_unassigned`
+ FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users`
+ WHERE (`notify_overdue_unassigned` = '1' OR `notify_overdue_my` = '1')
+ AND (`heskprivileges` LIKE '%can_view_tickets%' OR `isadmin` = '1')");
+
+$users = array();
+while ($row = hesk_dbFetchAssoc($user_rs)) {
+ $users[$row['id']] = $row;
+}
+
+$tickets_to_flag = array();
+$tickets_log_sql = array();
+while ($ticket = hesk_dbFetchAssoc($rs)) {
+ hesk_overdue_ticket_log("=======================");
+
+ // Make sure all values are properly formatted for email
+ $ticket['dt'] = hesk_date($ticket['dt'], true);
+ $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
+ $ticket['last_reply_by'] = hesk_getReplierName($ticket);
+ $ticket['due_date'] = hesk_format_due_date($ticket['due_date']);
+ $ticket = hesk_ticketToPlain($ticket, 1, 0);
+
+ $owner_email = isset($users[$ticket['owner']]) ? $users[$ticket['owner']]['email'] : $hesklang['unas'];
+ if (!$hesk_settings['simulate_overdue_tickets']) {
+ if (hesk_sendOverdueTicketReminder($ticket, $users)) {
+ $tickets_to_flag[] = $ticket['id'];
+ $tickets_log_sql[] = "('".intval($ticket['id'])."', '".intval($ticket['category'])."', '".intval($ticket['priority'])."', '".intval($ticket['status'])."', '".intval($ticket['owner'])."', '".hesk_dbEscape($ticket['due_date'])."')";
+ $successful_emails++;
+
+ hesk_overdue_ticket_log("[{$hesklang['success']}]\n{$hesklang['trackID']}: {$ticket['trackid']}\n{$hesklang['email']}: {$owner_email}");
+
+ // Let's force flag/insert into log every 1000 tickets to make sure we don't hit the max_allowed_packet limit, and to free some memory
+ if ($successful_emails % 1000 == 0) {
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."log_overdue` (`ticket`, `category`, `priority`, `status`, `owner`, `due_date`) VALUES " . implode(',', $tickets_log_sql));
+ hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `overdue_email_sent` = '1' WHERE `id` IN (" . implode(',', $tickets_to_flag) . ")");
+ $tickets_to_flag = array();
+ $tickets_log_sql = array();
+ }
+ } else {
+ $failed_emails++;
+ hesk_overdue_ticket_log("[{$hesklang['error']}]\n{$hesklang['trackID']}: {$ticket['trackid']}\n{$hesklang['email']}: {$owner_email}");
+ }
+ } else {
+ hesk_overdue_ticket_log("{$hesklang['trackID']}: {$ticket['trackid']}\n{$hesklang['email']}: {$owner_email}");
+ }
+ hesk_overdue_ticket_log("=======================");
+}
+
+// Flag/insert any remaning tickets
+if (count($tickets_to_flag) > 0 && !$hesk_settings['simulate_overdue_tickets']) {
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."log_overdue` (`ticket`, `category`, `priority`, `status`, `owner`, `due_date`) VALUES " . implode(',', $tickets_log_sql));
+ hesk_dbQuery("UPDATE `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` SET `overdue_email_sent` = '1' WHERE `id` IN (" . implode(',', $tickets_to_flag) . ")");
+}
+
+hesk_overdue_ticket_log(sprintf($hesklang['overdue_finished'], $successful_emails, $failed_emails));
+
+function hesk_overdue_ticket_log($message, $do_die=false) {
+ global $hesk_settings;
+
+ if ($hesk_settings['debug_mode']) {
+ echo $message . "\n";
+ }
+
+ if ($do_die) {
+ die();
+ }
+} // END hesk_overdue_ticket_log
diff --git a/hesk/cron/index.htm b/hesk/cron/index.htm
new file mode 100644
index 0000000..d79f2c9
--- /dev/null
+++ b/hesk/cron/index.htm
@@ -0,0 +1,8 @@
+
+
+403 Forbidden
+
+Forbidden
+You don't have permission to access this folder.
+
- Version: 3.1.2 from 18th August 2020
+ Version: 3.2.0 from 28th February 2021
Developed by: Klemen Stirn, Mike Koch
Help Desk Software HESK Free PHP Scripts HESK 3 CHANGELOG
+Changes in 3.2.0 - 28th February 2021www )
+
Changes in 3.1.2 - 18th August 2020
-© Copyright HESK.COM 2005-2020. All rights reserved.
© Copyright HESK.COM 2005-2021. All rights reserved.
diff --git a/hesk/docs/index.html b/hesk/docs/index.html
index 25fe7cf..4dd9fdd 100644
--- a/hesk/docs/index.html
+++ b/hesk/docs/index.html
@@ -15,7 +15,7 @@
- Version: 3.1.2 from 18th August 2020
+ Version: 3.2.0 from 28th February 2021
Developed by: Klemen Stirn, Mike Koch
Help Desk Software HESK Free PHP Scripts
-© Copyright HESK.COM 2005-2020. All rights reserved.
© Copyright HESK.COM 2005-2021. All rights reserved.
diff --git a/hesk/docs/license.html b/hesk/docs/license.html
index 7d808a9..1fbb790 100644
--- a/hesk/docs/license.html
+++ b/hesk/docs/license.html
@@ -14,15 +14,14 @@
Notice: The latest version of this agreement is published at HESK.com EULA webpage
-HESK Software End User License Agreement
+This End-User License Agreement (EULA) is a legal agreement between either an individual or a legal entity or association intending to use the Software ("You" or "Customer") and HESK.COM. By installing, copying, or otherwise using the Software, You represent, warrant, and agree that You have read, understood, and agree to be bound by the terms of the EULA. If You do not agree to be bound by the EULA, or You do not have the authority to bind the Customer to the EULA, You may not use the Software.
-This End-User License Agreement (EULA) is a legal agreement between either and individual or a legal entity or association intending to use the Software ("You" or "Customer") and HESK.COM. By installing, copying, or otherwise using the Software, You represent, warrant, and agree that You have read, understood, and agree to be bound by the terms of the EULA. If You do not agree to be bound of the EULA, or You do not have authority to bind Customer to the EULA, You may not use the Software.
1. Definitions
"Copyright headers" means a written copyright notice by HESK.COM located in Software source code and normally not visible to Web Users.
-"HESK.COM" ("Author", "We", "Us") means Klemen Stirn, the author and copyrights owner of the Software, his employees, representatives and contractors.
+"HESK.COM" ("Author", "We", "Us") means Klemen Stirn, the founder and copyrights owner of the Software, his employees, representatives, and contractors.
"License Key" means the key that is used to activate special Software functions, such as the removal of Powered by links, in one or more installed copies of Software.
@@ -44,22 +43,22 @@
3. Conditions and Limitations
-Distribution.
Distribution.
-Separation of Components.
Separation of Components.
-Software Transfer.
Software Transfer.
-Source code
+Source code
-Termination.
+Termination.
-Third party components.
Third-party components.
@@ -67,7 +66,7 @@ The Software may contain certain components provided by third parties and releas
You are not allowed to remove or modify the Powered by links in the Software without a valid License Key.
-Removing or modifying Powered by links without a valid a License Key means You are in a direct violation of the EULA and You may not use the Software.
+Removing or modifying Powered by links without a valid License Key means You are in a direct violation of the EULA, and You may not use the Software.
A single License Key can cover one or more copies of the Software installed, all of which must be registered in the License Manager. Access to the License Manager is provided along with a License Key.
@@ -76,18 +75,18 @@ The Software may contain certain components provided by third parties and releas
5. Copyright
-© Copyright 2020 Klemen Stirn. All rights reserved.
+© Copyright 2021 Klemen Stirn. All rights reserved.
-Some components may be copyrighted by third parties. See component source code and/or included license agreements for details. Trademarks are property of their respective owners.
+Some components may be copyrighted by third parties. See component source code and/or included license agreements for details. Trademarks are the property of their respective owners.
6. Trademark Policy
-HESK is a registered trademark of Klemen Stirn. Certain usages of the Trademark are fine and no specific permission from the Author is needed:
+HESK is a registered trademark of Klemen Stirn. Certain usages of the Trademark are acceptable, and no specific permission from the Author is needed:
there is no commercial intent behind the use,
-what You are referring to is in fact HESK. If someone is confused into thinking that what isn't HESK is in fact HESK, You are probably doing something wrong,
+what You are referring to is, in fact, HESK. If someone is confused into thinking that what isn't HESK is, in fact, HESK, You are probably doing something wrong,
there is no suggestion (through words or appearance) that Your project is approved, sponsored, or affiliated with HESK or its related projects unless it actually has been approved by and is accountable to the Author.
@@ -95,27 +94,27 @@ The Software may contain certain components provided by third parties and releas
any commercial use,
-use on or in relation to a Software product that includes or is built on top of a product supplied by Author, if there is any commercial intent associated with that product,
+use on or in relation to a software product that includes or is built on top of a product supplied by Author, if there is any commercial intent associated with that product,
use in a domain name or URL,
-use for merchandising purposes, e.g. on t-shirts and the like,
-use of a name which includes the letters HESK in relation to computer hardware or Software,
+use for merchandising purposes, e.g., on t-shirts and the like,
+use of a name that includes the letters HESK in relation to computer hardware or software,
services relating to any of the above.
-If You wish to have permission for any of the uses above or for any other use which is not specifically referred to in this policy, please contact HESK.COM to verify if Your proposed use is permissible. Permission may only be granted subject to certain conditions and these may include the requirement that You enter into an agreement with me to maintain the quality of the product and/or service which You intend to supply at a prescribed level.
+If You wish to have permission for any of the uses above or for any other use which is not specifically referred to in this policy, please contact HESK.COM to verify if Your proposed use is permissible. Permission may only be granted subject to certain conditions, and these may include the requirement that You enter into an agreement with the Author to maintain the quality of the product and/or service which You intend to supply at a prescribed level.
While there may be exceptions, it is very unlikely that HESK.COM will approve Trademark use in the following cases:
use of a Trademark in a company name,
-use of a Trademark in a domain name which has a commercial intent. The commercial intent can range from promotion of a company or product, to collecting revenue generated by advertising,
-the calling of any Software or product by the name HESK (or another related Trademark), unless that Software or product is a substantially unmodified HESK product,
-use in combination with any other marks or logos. This include use of a Trademark in a manner that creates a "combined mark," or use that integrates other wording with the Trademark in a way that the public may think of the use as a new mark (for example Club HESK or HESKBooks, or in a way that by use of special fonts or presentation with nearby words or images conveys an impression that the two are tied in some way),
+use of a Trademark in a domain name that has a commercial intent. The commercial intent can range from promotion of a company or product to collecting revenue generated by advertising,
+the calling of any software or product by the name HESK (or another related Trademark), unless that software or product is a substantially unmodified HESK product,
+use in combination with any other marks or logos. This include use of a Trademark in a manner that creates a "combined mark," or use that integrates other wording with the Trademark in a way that the public may think of the use as a new mark (for example, Club HESK or HESKBooks, or in a way that by use of special fonts or presentation with nearby words or images conveys an impression that the two are tied in some way),
use in combination with any product or service which is presented as being Certified or Official or formally associated with me or my products or services,
use in a way which implies an endorsement where that doesn't exist, or which attempts to unfairly or confusingly capitalise on the goodwill or brand of the project,
-use of a Trademark in a manner that disparages HESK and is not clearly third-party parody,
-on or in relation to a Software product which constitutes a substantially modified version of a product supplied by HESK.com, that is to say with material changes to the code, or services relating to such a product,
-in a title or metatag of a web page whose sole intention or result is to influence search engine rankings or result listings, rather than for discussion, development or advocacy of the Trademarks.
+use of a Trademark in a manner that disparages HESK and is not clearly a third-party parody,
+on or in relation to a software product which constitutes a substantially modified version of a product supplied by HESK.com, that is to say with material changes to the code, or services relating to such a product,
+in a title or metatag of a web page whose sole intention or result is to influence search engine rankings or result listings, rather than for discussion, development, or advocacy of the Trademarks.
@@ -131,7 +130,7 @@ The Software may contain certain components provided by third parties and releas
9. Modification
-The EULA may be modified by HESK.com at any time. The new version of the EULA becomes valid when published on HESK.COM website. You are encouraged to regularly check back for updates.
+The EULA may be modified by HESK.com at any time. The new version of the EULA becomes valid when published on HESK.COM website. You are encouraged to check back for updates regularly.
10. Other
diff --git a/hesk/docs/quick-guide.html b/hesk/docs/quick-guide.html
index f5f7227..ff590a5 100644
--- a/hesk/docs/quick-guide.html
+++ b/hesk/docs/quick-guide.html
@@ -15,7 +15,7 @@
- Version: 3.1.2 from 18th August 2020
+ Version: 3.2.0 from 28th February 2021
Developed by: Klemen Stirn, Mike Koch
Help Desk Software HESK Free PHP Scripts
Profile - set your name, email, signature, and a new password.Settings - set website URL, title and get familiar with HESK settings.Settings - set website URL, title, and get familiar with HESK settings.Categories - create help desk categories/departments.Users - create new staff accounts.Team - create new staff accounts.Knowledgebase - create knowledgebase (FAQ) categories and articles.Canned - set reply templates (canned responses).
@@ -71,9 +71,8 @@
Known upgrade issues:
-HESK language may be reset to English if new text was added.
-Passwords may not work after upgrade from very old versions (reset password ).
-If you purchased a license you may need to download a new license .
+HESK language will be reset to English if new text was added.
+When upgrading from very old versions, you might need to reset your password .
Upgrade steps:
@@ -93,10 +92,10 @@
Open install directory in your browser (https://www.example.com/helpdesk/install)
Click UPDATE HESK and follow instructions to update MySQL tables.
Delete the install directory.
Open the admin panel (https://www.example.com/helpdesk/admin) and log in with your username. If the password doesn't work anymore try resetting it .
Open the admin panel (https://www.example.com/helpdesk/admin) and log in with your username. If your password doesn't work anymore, reset it .
Test HESK to make sure the upgrade was successful and everything works. You may need to modify your Help Desk title and Custom field settings if they are not displaying correctly.
-If you own a HESK license you might need to download a new one .
+If you own a HESK license, you might need to download a new one .
If not, consider supporting HESK by purchasing a license .
Good luck with using HESK!
» Help & Support
-
For comprehensive and up-to-date help and troubleshooting guides please visit:
For comprehensive and up-to-date help and troubleshooting guides, please visit:HESK Knowledgebase
-© Copyright HESK.COM 2005-2020. All rights reserved.
© Copyright HESK.COM 2005-2021. All rights reserved.
diff --git a/hesk/docs/step-by-step-guide.html b/hesk/docs/step-by-step-guide.html
index 5220e30..dc22b6a 100644
--- a/hesk/docs/step-by-step-guide.html
+++ b/hesk/docs/step-by-step-guide.html
@@ -15,7 +15,7 @@
- Version: 3.1.2 from 18th August 2020
+ Version: 3.2.0 from 28th February 2021
Developed by: Klemen Stirn, Mike Koch
Help Desk Software HESK Free PHP Scripts » Install HESK
-
Please take 5 minutes to read the installation instructions carefully and completely! This will ensure a proper and easy installation.
+
Please take 5 minutes to read the installation instructions carefully and thoroughly! Doing so will ensure a proper and easy installation.
-
Before installing HESK you will need to obtain your MySQL database information, such as database name , database user and password .
-You need to get this information from your HOSTING COMPANY, HESK CANNOT help you find it.
+
Before installing HESK, you will need to obtain your MySQL database information, such as database name , user , and password .
+You need to get this information from your HOSTING COMPANY; HESK cannot help you find it.
TIP: Want a hassle-free help desk working in minutes? Sign up for HESK Cloud
@@ -60,13 +60,14 @@ You need to get this information from your HOSTING COMPANY, HESK CANNOT help you
Connect with FTP to the public folder of your server where the rest of your Web site is.
TIP: The public folder is usually called "public_html ", "www", "site" or "htdocs".
-TIP: Learn how to FTP files, read my simple FTP and CHMOD tutorial
+TIP: Learn how to FTP files by reading this FTP and CHMOD tutorial
Create a new folder where you will install HESK. Name it anything you like, for example, "helpdesk" or "support".
Upload all HESK files to your server. PHP files must be transferred in ASCII mode and images in BINARY mode.
-TIP: Most FTP clients will select the proper transfer mode automatically so you needn't worry about this.
TIP: Most FTP clients will automatically select the proper transfer mode, so you needn't worry about it.
+
Open hesk/install in your browser, for example (modify to your URL):
@@ -76,13 +77,13 @@ https://www.example.com/helpdesk/install
STEP 1: License agreement - read the HESK License agreement and confirm that you agree with the terms.STEP 2: Check setup - the script will test your server to see if all required settings are correct and advise solutions to any problems.STEP 3: Database settings - enter your MySQL database settings and the setup script will test them.STEP 3: Database settings - enter your MySQL database settings, and the setup script will test them.You need to get the correct MySQL database information from your hosting company! STEP 4: Setup database tables - everything OK, the script will install MySQL tables.STEP 4: Setup database tables - everything OK; the script will install MySQL tables.
-Before closing the upgrade script DELETE the "install" directory from your server!
+Before closing the installation script, DELETE the "install" directory from your server!
Well done, now it's time to set up your help desk! Click the Continue link in the install script or open the admin folder in your browser, for example:
Click the Settings link in the top menu to get to the settings page (if not there already)
-Take some time and get familiar with all the available settings. Most should be self-explanatory, for additional information
-about each setting click the [?
+Take some time and get familiar with all the available settings. Most should be self-explanatory; for additional information
+about each setting, click the [?
Don't forget to click the Save changes button at the bottom of the settings page to save your settings!
@@ -105,13 +106,13 @@ about each setting click the [? Click the "Profile" link to set your name, e-mail, signature, and password.
Add new categories (departments) on the "Categories" page. The default category cannot be deleted, but it can be renamed.
Add new categories (departments) on the "Categories" page. You cannot delete the default category, but you can rename it.
To create additional staff accounts visit the "Users" page. The default user (Administrator) cannot be deleted.
To create additional staff accounts, visit the "Team" page. You cannot delete the default user (Administrator), but you can change the username.
You can create canned responses on the "Canned" page. These are pre-written replies to common support questions.
To access and manage your knowledgebase click the "Knowledgebase" link.
+To access and manage your knowledgebase, click the "Knowledgebase" link.
The knowledgebase is a collection of answers to frequently asked questions (FAQ) and articles which provide self-help resources to your customers. You can arrange articles into categories and subcategories.
@@ -126,7 +127,7 @@ about each setting click the [? Customers can submit tickets and browse knowledgebase by visiting the main HESK folder, for example:https://www.example.com/helpdesk
If you have problems/questions see the "HELP and Troubleshooting" section further down.
If you have problems/questions, see the "HELP and Troubleshooting" section further down.
Support HESK development by purchasing a license
Good luck with using HESK!
? » Upgrading from old versions
-
Please take 5 minutes to read the upgrade instructions carefully and completely! This will ensure a proper and easy upgrade.
+
Please take 5 minutes to read the installation instructions carefully and thoroughly! Doing so will ensure a proper and easy installation.
Known upgrade issues
-HESK language may be reset to English if new text was added.
-Passwords may not work after upgrade from very old versions (reset password ).
-If you purchased a license you may need to download a new license .
+HESK language will be reset to English if new text was added.
+When upgrading from very old versions, you might need to reset your password .
TIP: Perform the upgrade in low-traffic hours when your Web site receives the least amount of visits.
@@ -168,7 +168,7 @@ about each setting click the [? Your HESK directory now contains the updated files you require for updating your copy of HESK.
-TIP: Images must be transferred to your server in binary mode and all other HESK files in ASCII mode. Most FTP clients will select the correct transfer mode automatically.
+TIP: You must transfer images in BINARY and all other files in ASCII mode. Most FTP clients will automatically select the proper transfer mode, so you needn't worry about it.
Did you rename your HESK's /admin folder? If yes, don't forget to move files from the new version's /admin folder into your renamed folder.
@@ -184,18 +184,18 @@ https://www.example.com/helpdesk/install
STEP 1: License agreement - read the HESK License agreement and confirm that you agree with the terms.STEP 2: Check setup - the script will test your server to see if all required settings are correct and advise solutions to any problems.STEP 3: Database settings - check your MySQL database settings and the script will test them.STEP 3: Database settings - check your MySQL database settings, and the script will test them.The settings must be the same as with your old HESK installation STEP 4: Update database tables - everything OK, the script will update existing MySQL tables.STEP 4: Update database tables - everything OK; the script will update existing MySQL tables.
Before closing the upgrade script, DELETE the "install" directory on your server!
-
Open the admin panel (https://www.example.com/helpdesk/admin) and log in with your username. If the password doesn't work anymore try resetting it .
+
Open the admin panel (https://www.example.com/helpdesk/admin) and log in with your username. If your password doesn't work anymore, reset it .
Test HESK to make sure the upgrade was successful and everything works. You may need to modify your Help Desk title and Custom field settings if they are not displaying correctly.
-If you own a HESK license you might need to download a new one .
+If you own a HESK license, you might need to download a new one .
If not, consider supporting HESK by purchasing a license .
Good luck with using HESK!
@@ -203,7 +203,7 @@ https://www.example.com/helpdesk/install
» HELP and Troubleshooting
-
For comprehensive and up-to-date help and troubleshooting guides please visit:
For comprehensive and up-to-date help and troubleshooting guides, please visit:HESK Knowledgebase
@@ -219,7 +219,7 @@ https://www.example.com/helpdesk/install
-
© Copyright HESK.COM 2005-2020. All rights reserved.
© Copyright HESK.COM 2005-2021. All rights reserved.
diff --git a/hesk/hesk_settings.inc.php b/hesk/hesk_settings.inc.php
index e9de103..54ecd44 100644
--- a/hesk/hesk_settings.inc.php
+++ b/hesk/hesk_settings.inc.php
@@ -1,5 +1,5 @@
GENERAL
@@ -12,12 +12,14 @@ $hesk_settings['webmaster_mail']='support@example.com';
$hesk_settings['noreply_mail']='support@example.com';
$hesk_settings['noreply_name']='Help Desk';
$hesk_settings['site_theme']='hesk3';
+$hesk_settings['admin_css']=0;
+$hesk_settings['admin_css_url']='https://www.example.com/hesk-style.css';
// --> Language settings
$hesk_settings['can_sel_lang']=0;
$hesk_settings['language']='English';
$hesk_settings['languages']=array(
-'English' => array('folder'=>'en','hr'=>'------ Reply above this line ------'),
+ 'English' => array('folder'=>'en','hr'=>'------ Reply above this line ------'),
);
// --> Database settings
@@ -39,9 +41,10 @@ $hesk_settings['max_listings']=20;
$hesk_settings['print_font_size']=12;
$hesk_settings['autoclose']=0;
$hesk_settings['max_open']=0;
+$hesk_settings['due_soon']=7;
$hesk_settings['new_top']=0;
$hesk_settings['reply_top']=0;
-$hesk_settings['hide_replies']=-1;
+$hesk_settings['hide_replies']=0;
$hesk_settings['limit_width']=800;
// --> Features
@@ -64,6 +67,7 @@ $hesk_settings['short_link']=0;
$hesk_settings['select_cat']=0;
$hesk_settings['select_pri']=0;
$hesk_settings['cat_show_select']=15;
+$hesk_settings['staff_ticket_formatting']=0;
// --> SPAM Prevention
$hesk_settings['secimg_use']=1;
@@ -78,17 +82,20 @@ $hesk_settings['question_ans']='PB6YM';
// --> Security
$hesk_settings['attempt_limit']=6;
$hesk_settings['attempt_banmin']=60;
+$hesk_settings['flood']=3;
$hesk_settings['reset_pass']=1;
$hesk_settings['email_view_ticket']=1;
$hesk_settings['x_frame_opt']=1;
+$hesk_settings['samesite']='Lax';
$hesk_settings['force_ssl']=0;
+$hesk_settings['url_key']='';
// --> Attachments
$hesk_settings['attachments']=array (
-'use' => 1,
-'max_number' => 2,
-'max_size' => 2097152,
-'allowed_types' => array('.gif','.jpg','.png','.zip','.rar','.csv','.doc','.docx','.xls','.xlsx','.txt','.pdf')
+ 'use' => 1,
+ 'max_number' => 2,
+ 'max_size' => 2097152,
+ 'allowed_types' => array('.gif','.jpg','.png','.zip','.rar','.csv','.doc','.docx','.xls','.xlsx','.txt','.pdf')
);
@@ -144,6 +151,7 @@ $hesk_settings['imap_job_wait']=15;
$hesk_settings['imap_host_name']='mail.example.com';
$hesk_settings['imap_host_port']=993;
$hesk_settings['imap_enc']='ssl';
+$hesk_settings['imap_noval_cert']=0;
$hesk_settings['imap_keep']=0;
$hesk_settings['imap_user']='';
$hesk_settings['imap_password']='';
@@ -200,7 +208,7 @@ $hesk_settings['check_updates']=1;
#############################
# DO NOT EDIT BELOW #
#############################
-$hesk_settings['hesk_version']='3.1.2';
+$hesk_settings['hesk_version']='3.2.0';
if ($hesk_settings['debug_mode'])
{
error_reporting(E_ALL);
diff --git a/hesk/img/escalate.jpg b/hesk/img/escalate.jpg
new file mode 100644
index 0000000..cb9d65b
Binary files /dev/null and b/hesk/img/escalate.jpg differ
diff --git a/hesk/inc/admin_functions.inc.php b/hesk/inc/admin_functions.inc.php
index 051fb04..193b726 100644
--- a/hesk/inc/admin_functions.inc.php
+++ b/hesk/inc/admin_functions.inc.php
@@ -30,6 +30,7 @@ $hesk_settings['possible_ticket_list'] = array(
'staffreplies' => $hesklang['replies'] . ' (' . $hesklang['staff'] .')',
'lastreplier' => $hesklang['last_replier'],
'time_worked' => $hesklang['ts'],
+'due_date' => $hesklang['due_date']
);
define('HESK_NO_ROBOTS', true);
@@ -214,7 +215,7 @@ function hesk_mergeTickets($merge_these, $merge_into)
hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `id`='".intval($row['id'])."'");
/* Log that ticket has been merged */
- $history .= sprintf($hesklang['thist13'],hesk_date(),$row['trackid'],$_SESSION['name'].' ('.$_SESSION['user'].')');
+ $history .= sprintf($hesklang['thist13'],hesk_date(),$row['trackid'],addslashes($_SESSION['name']).' ('.$_SESSION['user'].')');
/* Add old ticket ID to target ticket "merged" field */
$merged .= '#' . $row['trackid'];
@@ -736,43 +737,43 @@ function hesk_jsString($str)
function hesk_myOwnership()
{
+ // Admins can see all tickets
if ( ! empty($_SESSION['isadmin']) )
{
return '1';
}
+ // For staff, let's check permissions
$can_view_unassigned = hesk_checkPermission('can_view_unassigned',0);
$can_view_ass_others = hesk_checkPermission('can_view_ass_others',0);
$can_view_ass_by = hesk_checkPermission('can_view_ass_by', 0);
- // Can view all
+ // Can see all assigned and unassigned tickets
if ($can_view_unassigned && $can_view_ass_others)
{
return '1';
}
- $sql = '';
-
- if ( ! $can_view_unassigned && ! $can_view_ass_others)
+ // Can see my tickets, unassigned and tickets I assigned to others
+ if ($can_view_unassigned && $can_view_ass_by)
{
- $sql .= "`owner`=" . intval($_SESSION['id']);
- }
- elseif ( ! $can_view_unassigned)
- {
- $sql .= "`owner` != 0 ";
- }
- elseif ( ! $can_view_ass_others)
- {
- $sql .= "`owner` IN (0, " . intval($_SESSION['id']) . ") ";
+ return " (`owner` IN ('0', '" . intval($_SESSION['id']) . "') OR `assignedby` = " . intval($_SESSION['id']) . ") ";
}
- // Include tickets he/she assigned to others?
- if ($can_view_ass_by)
+ // Can see unassigned
+ if ($can_view_unassigned)
{
- return "(" . $sql . " OR `assignedby`=" . intval($_SESSION['id']) . ")";
+ return " `owner` IN ('0', '" . intval($_SESSION['id']) . "') ";
}
- return $sql;
+ // Can see my tickets and assigned to others
+ if ($can_view_ass_others)
+ {
+ return " `owner` != 0 ";
+ }
+
+ // Can see my tickets and tickets I assigned to others
+ return " (`owner` = " . intval($_SESSION['id']) . " OR `assignedby` = " . intval($_SESSION['id']) . ") ";
} // END hesk_myOwnership()
diff --git a/hesk/inc/assignment_search.inc.php b/hesk/inc/assignment_search.inc.php
index 5ccad9b..ac9dcb5 100644
--- a/hesk/inc/assignment_search.inc.php
+++ b/hesk/inc/assignment_search.inc.php
@@ -22,6 +22,50 @@ $s_ot[$fid] = empty($_GET['s_ot']) ? 0 : 1;
// -> UNASSIGNED
$s_un[$fid] = empty($_GET['s_un']) ? 0 : 1;
+// Overwrite by quick links? Ignore for ticket searches
+if ( ! isset($is_quick_link))
+{
+ $is_quick_link = false;
+}
+// Quick link: assigned to me
+elseif ($is_quick_link == 'my')
+{
+ $s_my[$fid] = 1;
+ $s_ot[$fid] = 0;
+ $s_un[$fid] = 0;
+}
+// Quick link: assigned to other
+elseif ($is_quick_link == 'ot')
+{
+ $s_my[$fid] = 0;
+ $s_ot[$fid] = 1;
+ $s_un[$fid] = 0;
+}
+// Quick link: unassigned
+elseif ($is_quick_link == 'un')
+{
+ $s_my[$fid] = 0;
+ $s_ot[$fid] = 0;
+ $s_un[$fid] = 1;
+}
+
+// Is assignment selection the same as a quick link?
+if ($is_quick_link === false)
+{
+ if ($s_my[$fid] == 1 && $s_ot[$fid] == 0 && $s_un[$fid] == 0)
+ {
+ $is_quick_link = 'my';
+ }
+ elseif ($s_my[$fid] == 0 && $s_ot[$fid] == 1 && $s_un[$fid] == 0)
+ {
+ $is_quick_link = 'ot';
+ }
+ elseif ($s_my[$fid] == 0 && $s_ot[$fid] == 0 && $s_un[$fid] == 1)
+ {
+ $is_quick_link = 'un';
+ }
+}
+
// -> Setup SQL based on selected ticket assignments
/* Make sure at least one is chosen */
diff --git a/hesk/inc/common.inc.php b/hesk/inc/common.inc.php
index 84c4e61..a39f469 100644
--- a/hesk/inc/common.inc.php
+++ b/hesk/inc/common.inc.php
@@ -173,10 +173,12 @@ function hesk_isValidIP($ip)
function hesk_setcookie($name, $value, $expire=0, $path="")
{
+ global $hesk_settings;
+
// PHP < 7.3 doesn't support the SameSite attribute, let's use a trick
if (PHP_VERSION_ID < 70300)
{
- setcookie($name, $value, $expire, $path . "; SameSite=Lax", null, HESK_SSL, true);
+ setcookie($name, $value, $expire, $path . '; SameSite=' . $hesk_settings['samesite'], null, HESK_SSL, true);
return true;
}
@@ -184,7 +186,7 @@ function hesk_setcookie($name, $value, $expire=0, $path="")
'expires' => $expire,
'path' => $path,
'secure' => HESK_SSL,
- 'samesite' => 'Lax',
+ 'samesite' => $hesk_settings['samesite'],
));
return true;
@@ -936,7 +938,7 @@ function hesk_getCategoryName($id)
$hesk_settings['category_data'][$id]['name'] = hesk_dbResult($res,0,0);
return $hesk_settings['category_data'][$id]['name'];
-} // END hesk_getOwnerName()
+} // END hesk_getCategoryName()
function hesk_getReplierName($ticket)
@@ -1168,13 +1170,13 @@ function hesk_handle_messages()
} // END hesk_handle_messages()
-function hesk_show_error($message,$title='',$append_colon=true)
+function hesk_show_error($message,$title='',$append_colon=true,$extra_class='')
{
global $hesk_settings, $hesklang;
$title = $title ? $title : $hesklang['error'];
$title = $append_colon ? $title . ':' : $title;
?>
-
+
@@ -1183,13 +1185,13 @@ function hesk_show_error($message,$title='',$append_colon=true)
} // END hesk_show_error()
-function hesk_show_success($message,$title='',$append_colon=true)
+function hesk_show_success($message,$title='',$append_colon=true,$extra_class='')
{
global $hesk_settings, $hesklang;
$title = $title ? $title : $hesklang['success'];
$title = $append_colon ? $title . ':' : $title;
?>
-
+
@@ -1198,13 +1200,13 @@ function hesk_show_success($message,$title='',$append_colon=true)
} // END hesk_show_success()
-function hesk_show_notice($message,$title='',$append_colon=true)
+function hesk_show_notice($message,$title='',$append_colon=true,$extra_class='')
{
global $hesk_settings, $hesklang;
$title = $title ? $title : $hesklang['note'];
$title = $append_colon ? $title . ':' : $title;
?>
-
+
@@ -1213,13 +1215,13 @@ function hesk_show_notice($message,$title='',$append_colon=true)
} // END hesk_show_notice()
-function hesk_show_info($message,$title='',$append_colon=true)
+function hesk_show_info($message,$title='',$append_colon=true,$extra_class='')
{
global $hesk_settings, $hesklang;
$title = $title ? $title : $hesklang['info'];
$title = $append_colon ? $title . ':' : $title;
?>
-
+
@@ -1651,6 +1653,33 @@ function hesk_date($dt='', $from_database=false, $is_str=true, $return_str=true)
} // End hesk_date()
+function hesk_format_due_date($dt, $is_str=true)
+{
+ global $hesk_settings;
+
+ if (!$dt)
+ {
+ return '';
+ }
+ elseif ($is_str)
+ {
+ $dt = strtotime($dt);
+ }
+
+ if (substr_count($hesk_settings['timeformat'], ' ') === 1)
+ {
+ list($date_format, $time_format) = explode(' ', $hesk_settings['timeformat']);
+ }
+ else
+ {
+ $date_format = 'Y-m-d';
+ }
+
+ return date($date_format, $dt);
+
+} // End hesk_format_due_date()
+
+
function hesk_array_fill_keys($keys, $value)
{
if ( version_compare(PHP_VERSION, '5.2.0', '>=') )
@@ -1870,22 +1899,33 @@ function hesk_isNumber($in, $error = 0)
} // END hesk_isNumber()
-function hesk_validateURL($url,$error)
+function hesk_validateURL($url, $error=false)
{
global $hesklang;
$url = trim($url);
- if (strpos($url,"'") !== false || strpos($url,"\"") !== false)
+ if (filter_var($url, FILTER_VALIDATE_URL) === false)
{
- die($hesklang['attempt']);
+ if ($error === false)
+ {
+ return '';
+ }
+
+ hesk_error($error);
}
- if (preg_match('/^https?:\/\/+(localhost|[\w\-]+\.[\w\-]+)/i',$url))
+ $scheme = parse_url($url, PHP_URL_SCHEME);
+ if ($scheme == 'https' || $scheme == 'http')
{
return hesk_input($url);
}
+ if ($error === false)
+ {
+ return '';
+ }
+
hesk_error($error);
} // END hesk_validateURL()
@@ -1925,7 +1965,7 @@ function hesk_input($in, $error=0, $redirect_to='', $force_slashes=0, $max_lengt
// Sanitize input
$in = hesk_clean_utf8($in);
$in = hesk_htmlspecialchars($in);
- $in = preg_replace('/&(\#[0-9]+;)/','&$1',$in);
+ //$in = preg_replace('/&(\#[0-9]+;)/','&$1',$in);
// Add slashes
if (HESK_SLASH || $force_slashes)
@@ -2080,6 +2120,8 @@ function hesk_session_regenerate_id()
function hesk_session_start()
{
+ global $hesk_settings;
+
session_name('HESK' . sha1(dirname(__FILE__) . '$r^k*Zkq|w1(G@!-D?3%') );
// PHP < 7.3 doesn't support the SameSite attribute, let's use a trick
@@ -2088,7 +2130,7 @@ function hesk_session_start()
$currentCookieParams = session_get_cookie_params();
session_set_cookie_params(
$currentCookieParams['lifetime'],
- $currentCookieParams['path'] . "; SameSite=Lax",
+ $currentCookieParams['path'] . '; SameSite=' . $hesk_settings['samesite'],
$currentCookieParams['domain'],
$currentCookieParams['secure'],
$currentCookieParams['httponly']
@@ -2096,7 +2138,7 @@ function hesk_session_start()
}
else
{
- session_set_cookie_params(array('samesite' => 'Lax'));
+ session_set_cookie_params(array('samesite' => $hesk_settings['samesite']));
}
session_cache_limiter('nocache');
@@ -2218,6 +2260,11 @@ function hesk_check_maintenance($dodie = true)
$hesk_settings['hesk_title'] == 'Help Desk' &&
$hesk_settings['hesk_url'] == 'http://www.example.com/helpdesk';
+ // Just exist if TEMPLATE_PATH is not defined
+ if ( ! defined('TEMPLATE_PATH')) {
+ exit($hesklang['mm1']);
+ }
+
// Maintenance mode - show notice and exit
$hesk_settings['render_template'](TEMPLATE_PATH . 'customer/maintenance.php', array(
'heskInstalled' => $hesk_installed
@@ -2414,4 +2461,32 @@ function hesk_generate_delete_modal($title, $body, $confirm_link, $delete_text =
Staff password reset email
'reset_password' => $hesklang['reset_password'],
+ // --> Overdue ticket email
+ 'overdue_ticket' => $hesklang['overdue_ticket'],
+
);
} // END hesk_validEmails()
@@ -408,7 +442,7 @@ function hesk_getEmailSubject($eml_file, $ticket='', $is_ticket=1, $strip=0)
}
/* Set category title */
- $ticket['category'] = hesk_msgToPlain(hesk_getCategoryName($ticket['category']), 1);
+ $ticket['category'] = hesk_msgToPlain(hesk_getCategoryName($ticket['category']), 1, 0);
/* Get priority */
switch ($ticket['priority'])
@@ -429,7 +463,11 @@ function hesk_getEmailSubject($eml_file, $ticket='', $is_ticket=1, $strip=0)
/* Set status */
$ticket['status'] = hesk_get_status_name($ticket['status']);
+ // Convert any entities in site title to plain text
+ $site_title = hesk_msgToPlain($hesk_settings['site_title'], 1, 0);
+
/* Replace all special tags */
+ $msg = str_replace('%%SITE_TITLE%%', $site_title, $msg);
$msg = str_replace('%%SUBJECT%%', $ticket['subject'], $msg);
$msg = str_replace('%%TRACK_ID%%', $ticket['trackid'], $msg);
$msg = str_replace('%%CATEGORY%%', $ticket['category'], $msg);
@@ -479,7 +517,7 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
}
// Convert any entities in site title to plain text
- $hesk_settings['site_title'] = hesk_msgToPlain($hesk_settings['site_title'], 1);
+ $site_title = hesk_msgToPlain($hesk_settings['site_title'], 1, 0);
/* If it's not a ticket-related mail (like "a new PM") just process quickly */
if ( ! $is_ticket)
@@ -488,9 +526,9 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
$msg = str_replace('%%NAME%%', $ticket['name'] ,$msg);
$msg = str_replace('%%SUBJECT%%', $ticket['subject'] ,$msg);
- $msg = str_replace('%%TRACK_URL%%', $trackingURL ,$msg);
- $msg = str_replace('%%SITE_TITLE%%',$hesk_settings['site_title'] ,$msg);
- $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'] ,$msg);
+ $msg = str_replace('%%TRACK_URL%%', $trackingURL.' ' ,$msg);
+ $msg = str_replace('%%SITE_TITLE%%',$site_title ,$msg);
+ $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'].' ' ,$msg);
$msg = str_replace('%%FIRST_NAME%%',hesk_full_name_to_first_name($ticket['name']),$msg);
if ( isset($ticket['message']) )
@@ -531,7 +569,7 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
}
/* Get owner name */
- $ticket['owner'] = hesk_msgToPlain( hesk_getOwnerName($ticket['owner']), 1);
+ $ticket['owner'] = hesk_msgToPlain( hesk_getOwnerName($ticket['owner']), 1, 0);
/* Set status */
$ticket['status'] = hesk_get_status_name($ticket['status']);
@@ -546,9 +584,9 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
$msg = str_replace('%%NAME%%', $ticket['name'] ,$msg);
$msg = str_replace('%%SUBJECT%%', $ticket['subject'] ,$msg);
$msg = str_replace('%%TRACK_ID%%', $ticket['trackid'] ,$msg);
- $msg = str_replace('%%TRACK_URL%%', $trackingURL ,$msg);
- $msg = str_replace('%%SITE_TITLE%%',$hesk_settings['site_title'],$msg);
- $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'] ,$msg);
+ $msg = str_replace('%%TRACK_URL%%', $trackingURL.' ' ,$msg);
+ $msg = str_replace('%%SITE_TITLE%%',$site_title ,$msg);
+ $msg = str_replace('%%SITE_URL%%', $hesk_settings['site_url'].' ',$msg);
$msg = str_replace('%%CATEGORY%%', $ticket['category'] ,$msg);
$msg = str_replace('%%PRIORITY%%', $ticket['priority'] ,$msg);
$msg = str_replace('%%OWNER%%', $ticket['owner'] ,$msg);
@@ -556,6 +594,7 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
$msg = str_replace('%%EMAIL%%', $ticket['email'] ,$msg);
$msg = str_replace('%%CREATED%%', $ticket['dt'] ,$msg);
$msg = str_replace('%%UPDATED%%', $ticket['lastchange'] ,$msg);
+ $msg = str_replace('%%DUE_DATE%%', $ticket['due_date'] ,$msg);
$msg = str_replace('%%ID%%', $ticket['id'] ,$msg);
$msg = str_replace('%%TIME_WORKED%%', $ticket['time_worked'] ,$msg);
$msg = str_replace('%%LAST_REPLY_BY%%',$ticket['last_reply_by'] ,$msg);
@@ -580,7 +619,7 @@ function hesk_getEmailMessage($eml_file, $ticket, $is_admin=0, $is_ticket=1, $ju
break;
}
- $msg = str_replace('%%'.strtoupper($k).'%%',stripslashes($ticket[$k]),$msg);
+ $msg = str_replace('%%'.strtoupper($k).'%%',$ticket[$k],$msg);
}
else
{
diff --git a/hesk/inc/export_functions.inc.php b/hesk/inc/export_functions.inc.php
index adf902b..0bf5535 100644
--- a/hesk/inc/export_functions.inc.php
+++ b/hesk/inc/export_functions.inc.php
@@ -28,7 +28,7 @@ function hesk_export_to_XML($sql, $export_selected = false)
$result = hesk_dbQuery("SELECT `id`,`name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users` ORDER BY `name` ASC");
while ($row=hesk_dbFetchAssoc($result))
{
- $admins[$row['id']]=$row['name'];
+ $admins[$row['id']]=hesk_msgToPlain($row['name'], 1, 0);
}
// Get category names
@@ -38,7 +38,7 @@ function hesk_export_to_XML($sql, $export_selected = false)
$res2 = hesk_dbQuery("SELECT `id`, `name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."categories` WHERE " . hesk_myCategories('id') . " ORDER BY `cat_order` ASC");
while ($row=hesk_dbFetchAssoc($res2))
{
- $my_cat[$row['id']] = hesk_msgToPlain($row['name'], 1);
+ $my_cat[$row['id']] = hesk_msgToPlain($row['name'], 1, 0);
}
}
@@ -179,6 +179,7 @@ function hesk_export_to_XML($sql, $export_selected = false)
'.$hesklang['message'].' |
'.$hesklang['owner'].' |
'.$hesklang['ts'].' |
+
'.$hesklang['due_date'].' |
';
foreach ($hesk_settings['custom_fields'] as $k=>$v)
@@ -234,20 +235,30 @@ function hesk_export_to_XML($sql, $export_selected = false)
$tmp .= '
'.$ticket['id'].' |
- |
+ |
'.hesk_date($ticket['dt'], true).' |
'.hesk_date($ticket['lastchange'], true).' |
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
+ |
';
+ // Due date
+ if (empty($ticket['due_date']))
+ {
+ $tmp .= ' | '."\n";
+ }
+ else
+ {
+ $tmp .= ''.hesk_date($ticket['due_date'], true).' | '."\n";
+ }
+
// Add custom fields
foreach ($hesk_settings['custom_fields'] as $k=>$v)
{
@@ -261,7 +272,7 @@ function hesk_export_to_XML($sql, $export_selected = false)
$tmp .= " \n";
break;
default:
- $tmp .= ' | ' . "\n";
+ $tmp .= ' | ' . "\n";
}
}
}
@@ -418,3 +429,9 @@ function hesk_export_to_XML($sql, $export_selected = false)
return array($success_msg, $tickets_exported);
} // END hesk_export_to_XML()
+
+
+function hesk_escape_CDATA($in)
+{
+ return str_replace(']]>', ']]]]>', $in);
+} // END hesk_escape_CDATA()
diff --git a/hesk/inc/header.inc.php b/hesk/inc/header.inc.php
index 733a82f..d5317b4 100644
--- a/hesk/inc/header.inc.php
+++ b/hesk/inc/header.inc.php
@@ -49,10 +49,11 @@ $onload='';
}
/* If page requires WYSIWYG editor include TinyMCE Javascript */
- if (defined('WYSIWYG') && $hesk_settings['kb_wysiwyg'])
+ if (defined('WYSIWYG') && ($hesk_settings['staff_ticket_formatting'] == 2 || $hesk_settings['kb_wysiwyg']))
{
+ require(HESK_PATH . 'inc/tiny_mce/tinymce.inc.php');
?>
-
+
+
+
+ * Links are maintained, with the 'href' copied over
+ * Information in the <head> is lost
+ *
+ *
+ * @param string html the input HTML
+ * @return string the HTML converted, as best as possible, to text
+ * @throws Html2TextException if the HTML could not be loaded as a {@link DOMDocument}
+ */
+ static function convert($html) {
+ // replace with spaces
+ $html = str_replace(" ", " ", $html);
+
+ $html = static::fixNewlines($html);
+
+ $doc = new \DOMDocument();
+ if (!$doc->loadHTML('
+ ';
+ echo '
+ '.$hesklang['instructions'].'', '*', false); ?>
-
+
-
+
@@ -245,6 +250,52 @@ $calling_script = basename($_SERVER['PHP_SELF'], '.php');
+
+
@@ -115,24 +118,27 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
@@ -140,20 +146,23 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
@@ -186,7 +195,11 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
array_unshift($hesk_settings['ticket_list'], 'priority');
$hesk_settings['possible_ticket_list']['priority'] = $hesklang['priority'];
- foreach ($hesk_settings['ticket_list'] as $key): ?>
+ foreach ($hesk_settings['ticket_list'] as $key):
+ if (!key_exists($key, $hesk_settings['possible_ticket_list'])) {
+ continue;
+ }
+ ?>
+
+
@@ -428,20 +497,23 @@ $more2 = empty($_GET['more2']) ? 0 : 1;
+
+
diff --git a/hesk/inc/statuses.inc.php b/hesk/inc/statuses.inc.php
index 964ddc3..7b7e80e 100644
--- a/hesk/inc/statuses.inc.php
+++ b/hesk/inc/statuses.inc.php
@@ -154,8 +154,8 @@ function hesk_get_status_checkboxes($selected = array())
echo '
- '.hesk_get_admin_ticket_status($k).'
+ '.hesk_get_admin_ticket_status($k).'
';
if ($i % 3 === 2) {
diff --git a/hesk/inc/ticket_list.inc.php b/hesk/inc/ticket_list.inc.php
index c918ebf..2be4882 100644
--- a/hesk/inc/ticket_list.inc.php
+++ b/hesk/inc/ticket_list.inc.php
@@ -44,16 +44,108 @@ $mysql_time = hesk_dbTime();
/* Get number of tickets and page number */
$result = hesk_dbQuery($sql_count);
-$total = hesk_dbResult($result);
-// $header_text should come from the page including this (i.e. admin_main.php, show_tickets.php)
-echo str_replace('%%HESK_TICKET_COUNT%%', $total, $header_text);
+while ($row = hesk_dbFetchAssoc($result))
+{
+ // Total tickets found
+ $totals['filtered']['all'] += $row['cnt'];
-if ($total > 0)
+ // Total by status
+ if (isset($totals['filtered']['by_status'][$row['status']]))
+ {
+ $totals['filtered']['by_status'][$row['status']] += $row['cnt'];
+ }
+ else
+ {
+ $totals['filtered']['by_status'][$row['status']] = $row['cnt'];
+ }
+
+ // Count all filtered open tickets
+ if (isset($row['status']) && $row['status'] != 3)
+ {
+ $totals['filtered']['open'] += $row['cnt'];
+ }
+
+ // Totals by assigned to
+ if (isset($row['assigned_to'])):
+ switch ($row['assigned_to'])
+ {
+ case 1:
+ $totals['filtered']['assigned_to_me'] += $row['cnt'];
+ break;
+ case 2:
+ $totals['filtered']['assigned_to_others'] += $row['cnt'];
+ break;
+ case 3:
+ $totals['filtered']['assigned_to_others'] += $row['cnt'];
+ $totals['filtered']['assigned_to_others_by_me'] += $row['cnt'];
+ break;
+ default:
+ $totals['filtered']['unassigned'] += $row['cnt'];
+ }
+ endif;
+
+ // Total by due date; ignore for Resolved tickets
+ if ($row['status'] != 3)
+ {
+ switch ($row['due'])
+ {
+ case 1:
+ $totals['filtered']['due_soon'] += $row['cnt'];
+ break;
+ case 2:
+ $totals['filtered']['overdue'] += $row['cnt'];
+ break;
+ }
+ }
+}
+
+// Quick link: assigned to me
+if ($is_quick_link == 'my')
+{
+ $total = $totals['filtered']['assigned_to_me'];
+}
+// Quick link: assigned to other
+elseif ($is_quick_link == 'ot')
+{
+ $total = $totals['filtered']['assigned_to_others'];
+}
+// Quick link: unassigned
+elseif ($is_quick_link == 'un')
+{
+ $total = $totals['filtered']['unassigned'];
+}
+// Quick link: due soon
+elseif ($is_quick_link == 'due')
+{
+ $total = $totals['filtered']['due_soon'];
+}
+// Quick link: overdue
+elseif ($is_quick_link == 'ovr')
+{
+ $total = $totals['filtered']['overdue'];
+}
+// Quick link: all open
+elseif ($is_quick_link == 'alo')
+{
+ $total = $totals['open'];
+}
+// Quick link: all
+elseif ($is_quick_link == 'all')
+{
+ $total = $totals['all'];
+}
+// No quick link
+else
+{
+ $total = $totals['filtered']['all'];
+}
+
+if ($total > 0 || $is_quick_link)
{
/* This query string will be used to browse pages */
- if ($href == 'show_tickets.php')
+ if ($href == 'admin_main.php' || $href == 'show_tickets.php')
{
#$query = 'status='.$status;
@@ -72,8 +164,6 @@ if ($total > 0)
$query .= '&cot='.$cot;
$query .= '&g='.$group;
-
- $query .= '&page=';
}
else
{
@@ -89,9 +179,16 @@ if ($total > 0)
$query .= '&s_my='.$s_my[2];
$query .= '&s_ot='.$s_ot[2];
$query .= '&s_un='.$s_un[2];
- $query .= '&page=';
}
- $query_for_pagination = $query;
+
+ $query_for_quick_links = $query;
+
+ if ($is_quick_link !== false)
+ {
+ $query .= '&ql=' . $is_quick_link;
+ }
+
+ $query_for_pagination = $query . '&page=';
$pages = ceil($total/$maxresults) or $pages = 1;
if ($page > $pages)
@@ -111,7 +208,7 @@ if ($total > 0)
# echo "SQL: $sql\n
";
/* This query string will be used to order and reverse display */
- if ($href == 'show_tickets.php')
+ if ($href == 'admin_main.php' || $href == 'show_tickets.php')
{
#$query = 'status='.$status;
@@ -150,6 +247,11 @@ if ($total > 0)
#$query .= '&sort=';
}
+ if ($is_quick_link !== false)
+ {
+ $query .= '&ql=' . $is_quick_link;
+ }
+
$query .= '&asc=';
/* Print the table with tickets */
@@ -159,14 +261,61 @@ if ($total > 0)
$hesklang['confirm_execute'],
"javascript:document.getElementById('delete-tickets-form').submit()",
$hesklang['confirm']);
- ?>
-
![<?php echo $hesklang['escalate']['tab']; ?>](<?php echo HESK_PATH; ?>img/escalate.jpg)
+
+