+
+
+
+
+ ';
+ ?>
+
@@ -756,6 +731,30 @@ if ( defined('HESK_DEMO') )
?>
+
+
+
+
+
+ ';
+ ?>
+
+
+
+
+
+ ';
+ ?>
+
@@ -768,18 +767,6 @@ if ( defined('HESK_DEMO') )
?>
-
-
-
-
- ';
- ?>
-
@@ -831,6 +818,29 @@ if ( defined('HESK_DEMO') )
?>
+
+
+
+
+
+
+ ';
+ ?>
+
+
+
@@ -862,13 +872,18 @@ if ( defined('HESK_DEMO') )
+
+
+
+
+
+
+
+ +
@@ -884,24 +900,13 @@ if ( defined('HESK_DEMO') )
-
+
-
+
- - -
- ';
- ?>
-
-
@@ -958,6 +963,14 @@ if ( defined('HESK_DEMO') )
+ -
+
-
+
- - -
+
+
+
+
+
+
+
@@ -1059,18 +1072,19 @@ if ( defined('HESK_DEMO') )
-
+
-
- ';
+
+
+ ';
?>
@@ -1081,8 +1095,8 @@ if ( defined('HESK_DEMO') )
$on = $hesk_settings['kb_wysiwyg'] ? 'checked="checked"' : '';
$off = $hesk_settings['kb_wysiwyg'] ? '' : 'checked="checked"';
echo '
-
- ';
+
+ ';
?>
+
+
@@ -1466,8 +1489,8 @@ if ( defined('HESK_DEMO') )
}
echo '
-
- ';
+
+ ';
?>
@@ -1478,6 +1501,12 @@ if ( defined('HESK_DEMO') )
+
+
+
+
+
+
+
-
+
+
+
+
+ />
+
+
@@ -1612,7 +1641,7 @@ if ( defined('HESK_DEMO') )
@@ -1655,6 +1684,36 @@ if ( defined('HESK_DEMO') )
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1666,6 +1725,14 @@ if ( defined('HESK_DEMO') )
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1717,6 +1784,39 @@ if ( defined('HESK_DEMO') )
+
+
+
+
+
+
+
+ $title)
+ {
+ echo '
+
+
+
+
+ ';
+ }
+ ?>
+
+
+
+
+ '; + ?> +
+
+
+
+ '; + ?> +
@@ -1772,6 +1872,21 @@ if ( defined('HESK_DEMO') )
+
+
';
+}
+// Show a notice if we are in "Knowledgebase only" mode
+if ( hesk_check_kb_only(false) )
+{
+ echo '
+
+
+
+
+
+ +
+
+
+
+
+
+
+
@@ -2367,7 +2482,7 @@ function hesk_testLanguage($return_options = 0)
}
/* Check if language file is for current version */
- if (strpos($tmp,'$hesklang[\'recaptcha_error\']') === false)
+ if (strpos($tmp,'$hesklang[\'ms01\']') === false)
{
$err .= " |----> WRONG VERSION (not ".$hesk_settings['hesk_version'].")\n";
}
diff --git a/admin/admin_settings_save.php b/admin/admin_settings_save.php
index 510e0be9..68e1a293 100644
--- a/admin/admin_settings_save.php
+++ b/admin/admin_settings_save.php
@@ -1,7 +1,7 @@
Features */
$set['autologin'] = empty($_POST['s_autologin']) ? 0 : 1;
$set['autoassign'] = empty($_POST['s_autoassign']) ? 0 : 1;
+$set['custclose'] = empty($_POST['s_custclose']) ? 0 : 1;
$set['custopen'] = empty($_POST['s_custopen']) ? 0 : 1;
$set['rating'] = empty($_POST['s_rating']) ? 0 : 1;
$set['cust_urgency'] = empty($_POST['s_cust_urgency']) ? 0 : 1;
$set['sequential'] = empty($_POST['s_sequential']) ? 0 : 1;
+$set['time_worked'] = empty($_POST['s_time_worked']) ? 0 : 1;
+$set['spam_notice'] = empty($_POST['s_spam_notice']) ? 0 : 1;
$set['list_users'] = empty($_POST['s_list_users']) ? 0 : 1;
$set['debug_mode'] = empty($_POST['s_debug_mode']) ? 0 : 1;
$set['short_link'] = empty($_POST['s_short_link']) ? 0 : 1;
+$set['select_cat'] = empty($_POST['s_select_cat']) ? 0 : 1;
+$set['select_pri'] = empty($_POST['s_select_pri']) ? 0 : 1;
/* --> SPAM prevention */
$set['secimg_use'] = empty($_POST['s_secimg_use']) ? 0 : ( hesk_POST('s_secimg_use') == 2 ? 2 : 1);
@@ -173,8 +178,7 @@ for ($i=1;$i<=10;$i++)
{
$set['secimg_sum'] .= substr('AEUYBDGHJLMNPQRSTVWXZ123456789', rand(0,29), 1);
}
-$set['recaptcha_use'] = empty($_POST['s_recaptcha_use']) ? 0 : 1;
-$set['recaptcha_ssl'] = empty($_POST['s_recaptcha_ssl']) ? 0 : 1;
+$set['recaptcha_use'] = hesk_checkMinMax( intval( hesk_POST('s_recaptcha_use') ) , 0, 2, 0);
$set['recaptcha_public_key'] = hesk_input( hesk_POST('s_recaptcha_public_key') );
$set['recaptcha_private_key'] = hesk_input( hesk_POST('s_recaptcha_private_key') );
$set['question_use'] = empty($_POST['s_question_use']) ? 0 : 1;
@@ -188,6 +192,7 @@ if ($set['attempt_limit'] > 0)
$set['attempt_limit']++;
}
$set['attempt_banmin'] = hesk_checkMinMax( intval( hesk_POST('s_attempt_banmin') ) , 5, 99999, 60);
+$set['reset_pass'] = empty($_POST['s_reset_pass']) ? 0 : 1;
$set['email_view_ticket'] = empty($_POST['s_email_view_ticket']) ? 0 : 1;
/* --> Attachments */
@@ -233,7 +238,7 @@ else
/*** KNOWLEDGEBASE ***/
/* --> Knowledgebase settings */
-$set['kb_enable'] = empty($_POST['s_kb_enable']) ? 0 : 1;
+$set['kb_enable'] = hesk_checkMinMax( intval( hesk_POST('s_kb_enable') ) , 0, 2, 1);
$set['kb_wysiwyg'] = empty($_POST['s_kb_wysiwyg']) ? 0 : 1;
$set['kb_search'] = empty($_POST['s_kb_search']) ? 0 : ( hesk_POST('s_kb_search') == 2 ? 2 : 1);
$set['kb_recommendanswers'] = empty($_POST['s_kb_recommendanswers']) ? 0 : 1;
@@ -248,6 +253,7 @@ $set['kb_popart'] = intval( hesk_POST('s_kb_popart') ); // Popular articles on
$set['kb_latest'] = intval( hesk_POST('s_kb_latest') ); // Popular articles on main category page
$set['kb_index_popart'] = intval( hesk_POST('s_kb_index_popart') );
$set['kb_index_latest'] = intval( hesk_POST('s_kb_index_latest') );
+$set['kb_related'] = intval( hesk_POST('s_kb_related') );
/*** EMAIL ***/
@@ -258,7 +264,7 @@ $set['smtp'] = empty($_POST['s_smtp']) ? 0 : 1;
if ($set['smtp'])
{
// Test SMTP connection
- $smtp_OK = hesk_testSMTP();
+ $smtp_OK = hesk_testSMTP(true);
// If SMTP not working, disable it
if ( ! $smtp_OK)
@@ -268,7 +274,7 @@ if ($set['smtp'])
}
else
{
- $set['smtp_host_name'] = hesk_input( hesk_POST('tmp_smtp_host_name', 'localhost') );
+ $set['smtp_host_name'] = hesk_input( hesk_POST('tmp_smtp_host_name', 'mail.domain.com') );
$set['smtp_host_port'] = intval( hesk_POST('tmp_smtp_host_port', 25) );
$set['smtp_timeout'] = intval( hesk_POST('tmp_smtp_timeout', 10) );
$set['smtp_ssl'] = empty($_POST['tmp_smtp_ssl']) ? 0 : 1;
@@ -285,8 +291,11 @@ $pop3_OK = true;
$set['pop3'] = empty($_POST['s_pop3']) ? 0 : 1;
if ($set['pop3'])
{
+ // Get POP3 fetching timeout
+ $set['pop3_job_wait'] = hesk_checkMinMax( intval( hesk_POST('s_pop3_job_wait') ) , 1, 1440, 15);
+
// Test POP3 connection
- $pop3_OK = hesk_testPOP3();
+ $pop3_OK = hesk_testPOP3(true);
// If POP3 not working, disable it
if ( ! $pop3_OK)
@@ -296,6 +305,7 @@ if ($set['pop3'])
}
else
{
+ $set['pop3_job_wait'] = intval( hesk_POST('s_pop3_job_wait', 15) );
$set['pop3_host_name'] = hesk_input( hesk_POST('tmp_pop3_host_name', 'mail.domain.com') );
$set['pop3_host_port'] = intval( hesk_POST('tmp_pop3_host_port', 110) );
$set['pop3_tls'] = empty($_POST['tmp_pop3_tls']) ? 0 : 1;
@@ -351,13 +361,78 @@ if ( ! $set['detect_typos'] || count($set['email_providers']) < 1 )
$set['email_providers'] = count($set['email_providers']) ? "'" . implode("','", $set['email_providers']) . "'" : '';
+
+/* --> Notify customer when */
+$set['notify_new'] = empty($_POST['s_notify_new']) ? 0 : 1;
+$set['notify_closed'] = empty($_POST['s_notify_closed']) ? 0 : 1;
+
+// SPAM tags
+$set['notify_skip_spam'] = empty($_POST['s_notify_skip_spam']) ? 0 : 1;
+$set['notify_spam_tags'] = array();
+
+if ( ! empty($_POST['s_notify_spam_tags']) && ! is_array($_POST['s_notify_spam_tags']) )
+{
+ $lines = preg_split('/$\R?^/m', $_POST['s_notify_spam_tags']);
+
+ foreach ($lines as $tag)
+ {
+ // Remove dangerous tags just as an extra precaution
+ $tag = str_replace( array(' 50)
+ {
+ continue;
+ }
+
+ // Escape single quotes and backslashes
+ $set['notify_spam_tags'][] = str_replace( array("\\", "'"), array("\\\\", "\\'"), $tag); // '
+ }
+}
+
+if ( count($set['notify_spam_tags']) < 1 )
+{
+ $set['notify_skip_spam'] = 0;
+ $set['notify_spam_tags'] = array('Spam?}','***SPAM***','[SPAM]','SPAM-LOW:','SPAM-MED:');
+}
+
+$set['notify_spam_tags'] = count($set['notify_spam_tags']) ? "'" . implode("','", $set['notify_spam_tags']) . "'" : '';
+
/* --> Other */
$set['strip_quoted'] = empty($_POST['s_strip_quoted']) ? 0 : 1;
+$set['eml_req_msg'] = empty($_POST['s_eml_req_msg']) ? 0 : 1;
$set['save_embedded'] = empty($_POST['s_save_embedded']) ? 0 : 1;
$set['multi_eml'] = empty($_POST['s_multi_eml']) ? 0 : 1;
$set['confirm_email'] = empty($_POST['s_confirm_email']) ? 0 : 1;
$set['open_only'] = empty($_POST['s_open_only']) ? 0 : 1;
+/*** TICKET LIST ***/
+
+$set['ticket_list'] = array();
+foreach ($hesk_settings['possible_ticket_list'] as $key => $title)
+{
+ if ( hesk_POST('s_tl_'.$key, 0) == 1)
+ {
+ $set['ticket_list'][] = $key;
+ }
+}
+
+// We need at least one of these: id, trackid, subject
+if ( ! in_array('id', $set['ticket_list']) && ! in_array('trackid', $set['ticket_list']) && ! in_array('subject', $set['ticket_list']) )
+{
+ $set['ticket_list'][] = 'trackid';
+}
+
+$set['ticket_list'] = count($set['ticket_list']) ? "'" . implode("','", $set['ticket_list']) . "'" : 'trackid';
+
+/* --> Other */
+$set['updatedformat'] = hesk_checkMinMax( intval( hesk_POST('s_updatedformat') ) , 0, 2, 2);
/*** MISC ***/
@@ -368,6 +443,19 @@ $set['daylight'] = empty($_POST['s_daylight']) ? 0 : 1;
$set['timeformat'] = hesk_input( hesk_POST('s_timeformat') ) or $set['timeformat'] = 'Y-m-d H:i:s';
/* --> Other */
+$set['ip_whois'] = hesk_input( hesk_POST('s_ip_whois', 'http://whois.domaintools.com/{IP}') );
+
+// If no {IP} tag append it to the end
+if ( strlen($set['ip_whois']) == 0 )
+{
+ $set['ip_whois'] = 'http://whois.domaintools.com/{IP}';
+}
+elseif ( strpos($set['ip_whois'], '{IP}') === false )
+{
+ $set['ip_whois'] .= '{IP}';
+}
+
+$set['maintenance_mode']= empty($_POST['s_maintenance_mode']) ? 0 : 1;
$set['alink'] = empty($_POST['s_alink']) ? 0 : 1;
$set['submit_notice'] = empty($_POST['s_submit_notice']) ? 0 : 1;
$set['online'] = empty($_POST['s_online']) ? 0 : 1;
@@ -599,19 +687,23 @@ $hesk_settings[\'reply_top\']=' . $set['reply_top'] . ';
// --> Features
$hesk_settings[\'autologin\']=' . $set['autologin'] . ';
$hesk_settings[\'autoassign\']=' . $set['autoassign'] . ';
+$hesk_settings[\'custclose\']=' . $set['custclose'] . ';
$hesk_settings[\'custopen\']=' . $set['custopen'] . ';
$hesk_settings[\'rating\']=' . $set['rating'] . ';
$hesk_settings[\'cust_urgency\']=' . $set['cust_urgency'] . ';
$hesk_settings[\'sequential\']=' . $set['sequential'] . ';
+$hesk_settings[\'time_worked\']=' . $set['time_worked'] . ';
+$hesk_settings[\'spam_notice\']=' . $set['spam_notice'] . ';
$hesk_settings[\'list_users\']=' . $set['list_users'] . ';
$hesk_settings[\'debug_mode\']=' . $set['debug_mode'] . ';
$hesk_settings[\'short_link\']=' . $set['short_link'] . ';
+$hesk_settings[\'select_cat\']=' . $set['select_cat'] . ';
+$hesk_settings[\'select_pri\']=' . $set['select_pri'] . ';
// --> SPAM Prevention
$hesk_settings[\'secimg_use\']=' . $set['secimg_use'] . ';
$hesk_settings[\'secimg_sum\']=\'' . $set['secimg_sum'] . '\';
$hesk_settings[\'recaptcha_use\']=' . $set['recaptcha_use'] . ';
-$hesk_settings[\'recaptcha_ssl\']=' . $set['recaptcha_ssl'] . ';
$hesk_settings[\'recaptcha_public_key\']=\'' . $set['recaptcha_public_key'] . '\';
$hesk_settings[\'recaptcha_private_key\']=\'' . $set['recaptcha_private_key'] . '\';
$hesk_settings[\'question_use\']=' . $set['question_use'] . ';
@@ -621,6 +713,7 @@ $hesk_settings[\'question_ans\']=\'' . $set['question_ans'] . '\';
// --> Security
$hesk_settings[\'attempt_limit\']=' . $set['attempt_limit'] . ';
$hesk_settings[\'attempt_banmin\']=' . $set['attempt_banmin'] . ';
+$hesk_settings[\'reset_pass\']=' . $set['reset_pass'] . ';
$hesk_settings[\'email_view_ticket\']=' . $set['email_view_ticket'] . ';
// --> Attachments
@@ -650,6 +743,7 @@ $hesk_settings[\'kb_popart\']=' . $set['kb_popart'] . ';
$hesk_settings[\'kb_latest\']=' . $set['kb_latest'] . ';
$hesk_settings[\'kb_index_popart\']=' . $set['kb_index_popart'] . ';
$hesk_settings[\'kb_index_latest\']=' . $set['kb_index_latest'] . ';
+$hesk_settings[\'kb_related\']=' . $set['kb_related'] . ';
// ==> EMAIL
@@ -669,6 +763,7 @@ $hesk_settings[\'email_piping\']=' . $set['email_piping'] . ';
// --> POP3 Fetching
$hesk_settings[\'pop3\']=' . $set['pop3'] . ';
+$hesk_settings[\'pop3_job_wait\']=' . $set['pop3_job_wait'] . ';
$hesk_settings[\'pop3_host_name\']=\'' . $set['pop3_host_name'] . '\';
$hesk_settings[\'pop3_host_port\']=' . $set['pop3_host_port'] . ';
$hesk_settings[\'pop3_tls\']=' . $set['pop3_tls'] . ';
@@ -684,13 +779,27 @@ $hesk_settings[\'loop_time\']=' . $set['loop_time'] . ';
$hesk_settings[\'detect_typos\']=' . $set['detect_typos'] . ';
$hesk_settings[\'email_providers\']=array(' . $set['email_providers'] . ');
+// --> Notify customer when
+$hesk_settings[\'notify_new\']=' . $set['notify_new'] . ';
+$hesk_settings[\'notify_skip_spam\']=' . $set['notify_skip_spam'] . ';
+$hesk_settings[\'notify_spam_tags\']=array(' . $set['notify_spam_tags'] . ');
+$hesk_settings[\'notify_closed\']=' . $set['notify_closed'] . ';
+
// --> Other
$hesk_settings[\'strip_quoted\']=' . $set['strip_quoted'] . ';
+$hesk_settings[\'eml_req_msg\']=' . $set['eml_req_msg'] . ';
$hesk_settings[\'save_embedded\']=' . $set['save_embedded'] . ';
$hesk_settings[\'multi_eml\']=' . $set['multi_eml'] . ';
$hesk_settings[\'confirm_email\']=' . $set['confirm_email'] . ';
$hesk_settings[\'open_only\']=' . $set['open_only'] . ';
+// ==> TICKET LIST
+
+$hesk_settings[\'ticket_list\']=array(' . $set['ticket_list'] . ');
+
+// --> Other
+$hesk_settings[\'updatedformat\']=\'' . $set['updatedformat'] . '\';
+
// ==> MISC
@@ -701,6 +810,8 @@ $hesk_settings[\'daylight\']=' . $set['daylight'] . ';
$hesk_settings[\'timeformat\']=\'' . $set['timeformat'] . '\';
// --> Other
+$hesk_settings[\'ip_whois\']=\'' . $set['ip_whois'] . '\';
+$hesk_settings[\'maintenance_mode\']=' . $set['maintenance_mode'] . ';
$hesk_settings[\'alink\']=' . $set['alink'] . ';
$hesk_settings[\'submit_notice\']=' . $set['submit_notice'] . ';
$hesk_settings[\'online\']=' . $set['online'] . ';
@@ -835,7 +946,7 @@ function hesk_getLanguagesArray($returnArray=0)
{
$add = 0;
}
- elseif ( ! preg_match('/\$hesklang\[\'recaptcha_error\'\]/', $tmp) )
+ elseif ( ! preg_match('/\$hesklang\[\'ms01\'\]/', $tmp) )
{
$add = 0;
}
diff --git a/admin/admin_submit_ticket.php b/admin/admin_submit_ticket.php
index a0d347af..9adf7319 100644
--- a/admin/admin_submit_ticket.php
+++ b/admin/admin_submit_ticket.php
@@ -1,7 +1,7 @@
3)
{
- $hesk_error_buffer['priority']=$hesklang['sel_app_priority'];
+ // If we are showing "Click to select" priority needs to be selected
+ if ($hesk_settings['select_pri'])
+ {
+ $tmpvar['priority'] = -1;
+ $hesk_error_buffer['priority'] = $hesklang['select_priority'];
+ }
+ else
+ {
+ $tmpvar['priority'] = 3;
+ }
}
$tmpvar['subject'] = hesk_input( hesk_POST('subject') ) or $hesk_error_buffer['subject']=$hesklang['enter_ticket_subject'];
@@ -121,6 +131,7 @@ $tmpvar['trackid'] = hesk_createID();
// Log who submitted ticket
$tmpvar['history'] = sprintf($hesklang['thist7'], hesk_date(), $_SESSION['name'].' ('.$_SESSION['user'].')');
+$tmpvar['openedby'] = $_SESSION['id'];
// Owner
$tmpvar['owner'] = 0;
@@ -214,7 +225,7 @@ if (count($hesk_error_buffer)!=0)
$_SESSION['as_name'] = hesk_POST('name');
$_SESSION['as_email'] = hesk_POST('email');
$_SESSION['as_category'] = hesk_POST('category');
- $_SESSION['as_priority'] = hesk_POST('priority');
+ $_SESSION['as_priority'] = $tmpvar['priority'];
$_SESSION['as_subject'] = hesk_POST('subject');
$_SESSION['as_message'] = hesk_POST('message');
$_SESSION['as_owner'] = $tmpvar['owner'];
@@ -225,7 +236,7 @@ if (count($hesk_error_buffer)!=0)
{
if ($v['use'])
{
- $_SESSION["as_$k"] = hesk_POST($k);
+ $_SESSION["as_$k"] = ($v['type'] == 'checkbox') ? hesk_POST_array($k) : hesk_POST($k);
}
}
diff --git a/admin/admin_ticket.php b/admin/admin_ticket.php
index ed4fd551..d44b4efe 100644
--- a/admin/admin_ticket.php
+++ b/admin/admin_ticket.php
@@ -1,7 +1,7 @@
$error\n";
+ }
+ $hesk_error_buffer = $tmp;
+
+ $hesk_error_buffer = $hesklang['pcer'].'
- +
@@ -496,6 +681,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
+
-
diff --git a/admin/knowledgebase_private.php b/admin/knowledgebase_private.php
index 24d23267..52c8759b 100644
--- a/admin/knowledgebase_private.php
+++ b/admin/knowledgebase_private.php
@@ -1,7 +1,7 @@
@@ -236,7 +236,7 @@ function hesk_show_kb_article($artid)
hesk_kb_header($hesk_settings['kb_link'], $article['catid']);
// Update views by 1
- hesk_dbQuery('UPDATE `'.hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` SET `views`=`views`+1 WHERE `id`='".intval($artid)."' LIMIT 1");
+ hesk_dbQuery('UPDATE `'.hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` SET `views`=`views`+1 WHERE `id`={$artid} LIMIT 1");
echo '
'.$hesklang['noac'].'';
diff --git a/admin/lock.php b/admin/lock.php
index 26c30c2a..ed03cf36 100644
--- a/admin/lock.php
+++ b/admin/lock.php
@@ -1,7 +1,7 @@
fetch_assoc();
$statusId = $statusRow['ID'];
-hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `status`='{$statusId}',`locked`='{$status}', `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
+hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET `status`='{$statusId}',`locked`='{$status}' $closedby_sql , `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `trackid`='".hesk_dbEscape($trackingID)."' LIMIT 1");
/* Back to ticket page and show a success message */
hesk_process_messages($tmp,'admin_ticket.php?track='.$trackingID.'&Refresh='.rand(10000,99999),'SUCCESS');
diff --git a/admin/mail.php b/admin/mail.php
index ea056d11..6ff15c02 100644
--- a/admin/mail.php
+++ b/admin/mail.php
@@ -1,7 +1,7 @@
1
// Get messages from the database
- $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` WHERE `".hesk_dbEscape($hesk_settings['mailtmp']['this'])."`='".intval($_SESSION['id'])."' AND `deletedby`!='".intval($_SESSION['id'])."' ORDER BY `id` DESC LIMIT ".intval($limit_down)." , ".intval($maxresults)." ");
+ $res = hesk_dbQuery("SELECT `id`, `from`, `to`, `subject`, `dt`, `read` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` WHERE `".hesk_dbEscape($hesk_settings['mailtmp']['this'])."`='".intval($_SESSION['id'])."' AND `deletedby`!='".intval($_SESSION['id'])."' ORDER BY `id` DESC LIMIT ".intval($limit_down)." , ".intval($maxresults)." ");
?>
@@ -609,10 +635,15 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
@@ -713,8 +764,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
@@ -778,19 +849,24 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
}
// SQL query for all
- $res = hesk_dbQuery("SELECT DATE(`dt`) AS `mydt`, COUNT(*) AS `cnt`, SUM( TIME_TO_SEC(`time_worked`) ) AS `seconds_worked` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE " . ( $can_run_reports_full ? '1' : "`owner` = '" . intval($_SESSION['id']) . "'" ) . " AND DATE(`dt`) BETWEEN '" . hesk_dbEscape($date_from) . "' AND '" . hesk_dbEscape($date_to) . "' GROUP BY `mydt`");
+ $res = hesk_dbQuery("SELECT DATE(`dt`) AS `mydt`, COUNT(*) AS `cnt`".($hesk_settings['time_worked'] ? ", SUM( TIME_TO_SEC(`time_worked`) ) AS `seconds_worked`" : '')." FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE " . ( $can_run_reports_full ? '1' : "`owner` = '" . intval($_SESSION['id']) . "'" ) . " AND {$hesk_settings['dt_sql']} GROUP BY `mydt`");
// Update ticket values
while ($row = hesk_dbFetchAssoc($res))
{
+ if ( ! $hesk_settings['time_worked'])
+ {
+ $row['seconds_worked'] = 0;
+ }
+
$tickets[$row['mydt']]['all'] += $row['cnt'];
- $tickets[$row['mydt']]['worked'] = hesk_SecondsToHHMMSS($row['seconds_worked']);
+ $tickets[$row['mydt']]['worked'] = $hesk_settings['time_worked'] ? hesk_SecondsToHHMMSS($row['seconds_worked']) : 0;
$totals['all'] += $row['cnt'];
$totals['worked'] += $row['seconds_worked'];
}
// SQL query for resolved
- $res = hesk_dbQuery("SELECT DATE(`dt`) AS `mydt`, COUNT(*) AS `cnt` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE " . ( $can_run_reports_full ? '1' : "`owner` = '" . intval($_SESSION['id']) . "'" ) . " AND `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsClosed` = 1) AND DATE(`dt`) BETWEEN '" . hesk_dbEscape($date_from) . "' AND '" . hesk_dbEscape($date_to) . "' GROUP BY `mydt`");
+ $res = hesk_dbQuery("SELECT DATE(`dt`) AS `mydt`, COUNT(*) AS `cnt` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE " . ( $can_run_reports_full ? '1' : "`owner` = '" . intval($_SESSION['id']) . "'" ) . " AND `status` IN (SELECT `ID` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."statuses` WHERE `IsClosed` = 1) AND {$hesk_settings['dt_sql']} GROUP BY `mydt`");
// Update ticket values
while ($row = hesk_dbFetchAssoc($res))
@@ -800,7 +876,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
}
// Convert total seconds worked to HH:MM:SS
- $totals['worked'] = hesk_SecondsToHHMMSS($totals['worked']);
+ $totals['worked'] = $hesk_settings['time_worked'] ? hesk_SecondsToHHMMSS($totals['worked']) : 0;
?>
@@ -808,8 +884,13 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
+
+ $error \n";
+ }
+ $hesk_error_buffer = $tmp;
+
+ $hesk_error_buffer = $hesklang['rfm'].'
$error \n";
+ }
+ $hesk_error_buffer = $tmp;
+
+ $hesk_error_buffer = $hesklang['rfm'].'
0) {
+ combinations += 10;
+ }
+
+ if (hesk_contains(password, lowercase) > 0) {
+ combinations += 26;
+ }
+
+ if (hesk_contains(password, uppercase) > 0) {
+ combinations += 26;
+ }
+
+ if (hesk_contains(password, punctuation) > 0) {
+ combinations += punctuation.length;
+ }
+
+ var totalCombinations = Math.pow(combinations, password.length);
+ var timeInSeconds = (totalCombinations / 200) / 2;
+ var timeInDays = timeInSeconds / 86400
+ var lifetime = 3650;
+ var percentage = timeInDays / lifetime;
+
+ var friendlyPercentage = hesk_cap(Math.round(percentage * 100), 98);
+
+ if (friendlyPercentage < (password.length * 5)) {
+ friendlyPercentage += password.length * 5;
+ }
+
+ var friendlyPercentage = hesk_cap(friendlyPercentage, 98);
+
+ var progressBar = document.getElementById("progressBar");
+ progressBar.style.width = friendlyPercentage + "%";
+
+ if (percentage > 1) {
+ // strong password
+ progressBar.classList.remove('progress-bar-danger');
+ progressBar.classList.remove('progress-bar-warning');
+ progressBar.classList.add('progress-bar-success');
+ return;
+ }
+
+ if (percentage > 0.5) {
+ // reasonable password
+ progressBar.classList.remove('progress-bar-danger');
+ progressBar.classList.remove('progress-bar-success');
+ progressBar.classList.add('progress-bar-warning');
+ return;
+ }
+
+ if (percentage > 0.10 || percentage <= 0.10) {
+ // weak password
+ progressBar.classList.remove('progress-bar-warning');
+ progressBar.classList.remove('progress-bar-success');
+ progressBar.classList.add('progress-bar-danger');
+ return;
+ }
+
+}
+
+function hesk_cap(number, max) {
+ if (number > max) {
+ return max;
+ } else {
+ return number;
+ }
+}
+
+function hesk_contains(password, validChars) {
+
+ count = 0;
+
+ for (i = 0; i < password.length; i++) {
+ var char = password.charAt(i);
+ if (validChars.indexOf(char) > -1) {
+ count++;
+ }
+ }
+
+ return count;
+}
+
+function setCookie(name, value, expires, path, domain, secure)
+{
+ document.cookie= name + "=" + escape(value) +
+ ((expires) ? "; expires=" + expires.toGMTString() : "") +
+ ((path) ? "; path=" + path : "") +
+ ((domain) ? "; domain=" + domain : "") +
+ ((secure) ? "; secure" : "");
+}
+
+function getCookie(name)
+{
+ var dc = document.cookie;
+ var prefix = name + "=";
+ var begin = dc.indexOf("; " + prefix);
+ if (begin == -1) {
+ begin = dc.indexOf(prefix);
+ if (begin != 0) return null;
+ } else {
+ begin += 2;
+ }
+ var end = document.cookie.indexOf(";", begin);
+ if (end == -1) {
+ end = dc.length;
+ }
+ return unescape(dc.substring(begin + prefix.length, end));
+}
+
+function deleteCookie(name, path, domain)
+{
+ if (getCookie(name)) {
+ document.cookie = name + "=" +
+ ((path) ? "; path=" + path : "") +
+ ((domain) ? "; domain=" + domain : "") +
+ "; expires=Thu, 01-Jan-70 00:00:01 GMT";
+ }
+}
diff --git a/hesk_style_v25.css b/hesk_style.css
similarity index 97%
rename from hesk_style_v25.css
rename to hesk_style.css
index 4a13d368..56c11b6f 100644
--- a/hesk_style_v25.css
+++ b/hesk_style.css
@@ -14,7 +14,7 @@ table.enclosing {
color : #4a5571;
font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
- width: 770px;
+ width: 960px;
}
@@ -216,7 +216,7 @@ fieldset {
background-color:white;
position:relative;
display:block;
- padding: 0px 10px 10px 10px;
+ padding: 15px 10px 10px 10px;
margin:20px 0px 20px 0px;
}
@@ -232,10 +232,8 @@ legend {
background-position: left top;
display:block;
width: auto;
- padding:4px 5px;
- margin:0px 0px 10px 0px;
+ padding:5px 5px;
position:relative;
- top: -12px;
width:130px;
}
@@ -551,10 +549,25 @@ td.admin_critical {
font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 11px;
border: 1px solid #ff66ff;
- border-top: 2px dashed #ff66ff;
padding: 1px;
}
+/* New styles in HESK version 2.6 */
+
+div.info {
+ border: 1px solid #9acfea;
+ background: #d9edf7;
+ color: #363636;
+ padding: 10px;
+ vertical-align: middle;
+}
+
+div.none {
+ color: #363636;
+ padding: 10px;
+ vertical-align: middle;
+}
+
.isError {
color: black;
background-color: #fff9f7;
diff --git a/hesk_style_v25RTL.css b/hesk_style_RTL.css
similarity index 97%
rename from hesk_style_v25RTL.css
rename to hesk_style_RTL.css
index a22825b3..d866def8 100644
--- a/hesk_style_v25RTL.css
+++ b/hesk_style_RTL.css
@@ -14,7 +14,7 @@ table.enclosing {
color : #4a5571;
font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 12px;
- width: 770px;
+ width: 960px;
}
@@ -216,7 +216,7 @@ fieldset {
background-color:white;
position:relative;
display:block;
- padding: 0px 10px 10px 10px;
+ padding: 15px 10px 10px 10px;
margin:20px 0px 20px 0px;
}
@@ -232,10 +232,8 @@ legend {
background-position: right top;
display:block;
width: auto;
- padding:4px 5px;
- margin:0px 0px 10px 0px;
+ padding:5px 5px;
position:relative;
- top: -12px;
width:130px;
}
@@ -551,7 +549,6 @@ td.admin_critical {
font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 11px;
border: 1px solid #ff66ff;
- border-top: 2px dashed #ff66ff;
padding: 1px;
}
@@ -691,6 +688,22 @@ td.admin_yellow {
padding: 1px;
}
+/* New styles in HESK version 2.6 */
+
+div.info {
+ border: 1px solid #9acfea;
+ background: #d9edf7;
+ color: #363636;
+ padding: 10px;
+ vertical-align: middle;
+}
+
+div.none {
+ color: #363636;
+ padding: 10px;
+ vertical-align: middle;
+}
+
/* New styles in HESK version 2.5 */
.kb_published {
diff --git a/inc/admin_functions.inc.php b/inc/admin_functions.inc.php
new file mode 100644
index 00000000..18c60720
--- /dev/null
+++ b/inc/admin_functions.inc.php
@@ -0,0 +1,738 @@
+ $hesklang['id'],
+'trackid' => $hesklang['trackID'],
+'dt' => $hesklang['submitted'],
+'lastchange' => $hesklang['last_update'],
+'category' => $hesklang['category'],
+'name' => $hesklang['name'],
+'email' => $hesklang['email'],
+'subject' => $hesklang['subject'],
+'status' => $hesklang['status'],
+'owner' => $hesklang['owner'],
+'replies' => $hesklang['replies'],
+'staffreplies' => $hesklang['replies'] . ' (' . $hesklang['staff'] .')',
+'lastreplier' => $hesklang['last_replier'],
+'time_worked' => $hesklang['ts'],
+);
+
+// Also possible to display all custom fields
+for ($i=1;$i<=20;$i++)
+{
+ if ($hesk_settings['custom_fields']['custom'.$i]['use'])
+ {
+ $hesk_settings['possible_ticket_list']['custom'.$i] = $hesk_settings['custom_fields']['custom'.$i]['name'];
+ }
+}
+
+/*** FUNCTIONS ***/
+
+
+function hesk_show_column($column)
+{
+ global $hesk_settings;
+
+ return in_array($column, $hesk_settings['ticket_list']) ? true : false;
+
+} // END hesk_show_column()
+
+
+function hesk_getHHMMSS($in)
+{
+ $in = hesk_getTime($in);
+ return explode(':', $in);
+} // END hesk_getHHMMSS();
+
+
+function hesk_getTime($in)
+{
+ $in = trim($in);
+
+ /* If everything is OK this simple check should return true */
+ if ( preg_match('/^([0-9]{2,3}):([0-5][0-9]):([0-5][0-9])$/', $in) )
+ {
+ return $in;
+ }
+
+ /* No joy, let's try to figure out the correct values to use... */
+ $h = 0;
+ $m = 0;
+ $s = 0;
+
+ /* How many parts do we have? */
+ $parts = substr_count($in, ':');
+
+ switch ($parts)
+ {
+ /* Only two parts, let's assume minutes and seconds */
+ case 1:
+ list($m, $s) = explode(':', $in);
+ break;
+
+ /* Three parts, so explode to hours, minutes and seconds */
+ case 2:
+ list($h, $m, $s) = explode(':', $in);
+ break;
+
+ /* Something other was entered, let's assume just minutes */
+ default:
+ $m = $in;
+ }
+
+ /* Make sure all inputs are integers */
+ $h = intval($h);
+ $m = intval($m);
+ $s = intval($s);
+
+ /* Convert seconds to minutes if 60 or more seconds */
+ if ($s > 59)
+ {
+ $m = floor($s / 60) + $m;
+ $s = intval($s % 60);
+ }
+
+ /* Convert minutes to hours if 60 or more minutes */
+ if ($m > 59)
+ {
+ $h = floor($m / 60) + $h;
+ $m = intval($m % 60);
+ }
+
+ /* MySQL accepts max time value of 838:59:59 */
+ if ($h > 838)
+ {
+ return '838:59:59';
+ }
+
+ /* That's it, let's send out formatted time string */
+ return str_pad($h, 2, "0", STR_PAD_LEFT) . ':' . str_pad($m, 2, "0", STR_PAD_LEFT) . ':' . str_pad($s, 2, "0", STR_PAD_LEFT);
+
+} // END hesk_getTime();
+
+
+function hesk_mergeTickets($merge_these, $merge_into)
+{
+ global $hesk_settings, $hesklang, $hesk_db_link;
+
+ /* Target ticket must not be in the "merge these" list */
+ if ( in_array($merge_into, $merge_these) )
+ {
+ $merge_these = array_diff($merge_these, array( $merge_into ) );
+ }
+
+ /* At least 1 ticket needs to be merged with target ticket */
+ if ( count($merge_these) < 1 )
+ {
+ $_SESSION['error'] = $hesklang['merr1'];
+ return false;
+ }
+
+ /* Make sure target ticket exists */
+ $res = hesk_dbQuery("SELECT `id`,`trackid`,`category` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `id`='".intval($merge_into)."' LIMIT 1");
+ if (hesk_dbNumRows($res) != 1)
+ {
+ $_SESSION['error'] = $hesklang['merr2'];
+ return false;
+ }
+ $ticket = hesk_dbFetchAssoc($res);
+
+ /* Make sure user has access to ticket category */
+ if ( ! hesk_okCategory($ticket['category'], 0) )
+ {
+ $_SESSION['error'] = $hesklang['merr3'];
+ return false;
+ }
+
+ /* Set some variables for later */
+ $merge['attachments'] = '';
+ $merge['replies'] = array();
+ $merge['notes'] = array();
+ $sec_worked = 0;
+ $history = '';
+ $merged = '';
+
+ /* Get messages, replies, notes and attachments of tickets that will be merged */
+ foreach ($merge_these as $this_id)
+ {
+ /* Validate ID */
+ if ( is_array($this_id) )
+ {
+ continue;
+ }
+ $this_id = intval($this_id) or hesk_error($hesklang['id_not_valid']);
+
+ /* Get required ticket information */
+ $res = hesk_dbQuery("SELECT `id`,`trackid`,`category`,`name`,`message`,`dt`,`time_worked`,`attachments` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE `id`='".intval($this_id)."' LIMIT 1");
+ if (hesk_dbNumRows($res) != 1)
+ {
+ continue;
+ }
+ $row = hesk_dbFetchAssoc($res);
+
+ /* Has this user access to the ticket category? */
+ if ( ! hesk_okCategory($row['category'], 0) )
+ {
+ continue;
+ }
+
+ /* Insert ticket message as a new reply to target ticket */
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`) VALUES ('".intval($ticket['id'])."','".hesk_dbEscape($row['name'])."','".hesk_dbEscape($row['message'])."','".hesk_dbEscape($row['dt'])."','".hesk_dbEscape($row['attachments'])."')");
+
+ /* Update attachments */
+ hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."attachments` SET `ticket_id`='".hesk_dbEscape($ticket['trackid'])."' WHERE `ticket_id`='".hesk_dbEscape($row['trackid'])."'");
+
+ /* Get old ticket replies and insert them as new replies */
+ $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` WHERE `replyto`='".intval($row['id'])."' ORDER BY `id` ASC");
+ while ( $reply = hesk_dbFetchAssoc($res) )
+ {
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` (`replyto`,`name`,`message`,`dt`,`attachments`,`staffid`,`rating`,`read`) VALUES ('".intval($ticket['id'])."','".hesk_dbEscape($reply['name'])."','".hesk_dbEscape($reply['message'])."','".hesk_dbEscape($reply['dt'])."','".hesk_dbEscape($reply['attachments'])."','".intval($reply['staffid'])."','".intval($reply['rating'])."','".intval($reply['read'])."')");
+ }
+
+ /* Delete replies to the old ticket */
+ hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` WHERE `replyto`='".intval($row['id'])."'");
+
+ /* Get old ticket notes and insert them as new notes */
+ $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` WHERE `ticket`='".intval($row['id'])."' ORDER BY `id` ASC");
+ while ( $note = hesk_dbFetchAssoc($res) )
+ {
+ hesk_dbQuery("INSERT INTO `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` (`ticket`,`who`,`dt`,`message`,`attachments`) VALUES ('".intval($ticket['id'])."','".intval($note['who'])."','".hesk_dbEscape($note['dt'])."','".hesk_dbEscape($note['message'])."','".hesk_dbEscape($note['attachments'])."')");
+ }
+
+ /* Delete replies to the old ticket */
+ hesk_dbQuery("DELETE FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."notes` WHERE `ticket`='".intval($row['id'])."'");
+
+ /* Delete old ticket */
+ 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'].')');
+
+ /* Add old ticket ID to target ticket "merged" field */
+ $merged .= '#' . $row['trackid'];
+
+ /* Convert old ticket "time worked" to seconds and add to $sec_worked variable */
+ list ($hr, $min, $sec) = explode(':', $row['time_worked']);
+ $sec_worked += (((int)$hr) * 3600) + (((int)$min) * 60) + ((int)$sec);
+ }
+
+ /* Convert seconds to HHH:MM:SS */
+ $sec_worked = hesk_getTime('0:'.$sec_worked);
+
+ // Get number of replies
+ $total = 0;
+ $staffreplies = 0;
+
+ $res = hesk_dbQuery("SELECT COUNT(*) as `cnt`, `staffid` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` WHERE `replyto`=".intval($ticket['id'])." GROUP BY CASE WHEN `staffid` = 0 THEN 0 ELSE 1 END ASC");
+ while ( $row = hesk_dbFetchAssoc($res) )
+ {
+ $total += $row['cnt'];
+ $staffreplies += ($row['staffid'] ? $row['cnt'] : 0);
+ }
+
+ $replies_sql = " `replies`={$total}, `staffreplies`={$staffreplies} , ";
+
+ // Get first staff reply
+ if ($staffreplies)
+ {
+ $res = hesk_dbQuery("SELECT `dt`, `staffid` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."replies` WHERE `replyto`=".intval($ticket['id'])." AND `staffid`>0 ORDER BY `dt` ASC LIMIT 1");
+ $reply = hesk_dbFetchAssoc($res);
+ $replies_sql = " `firstreply`='".hesk_dbEscape($reply['dt'])."', `firstreplyby`=".intval($reply['staffid'])." , ";
+ }
+
+ /* Update history (log) and merged IDs of target ticket */
+ hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` SET $replies_sql `time_worked`=ADDTIME(`time_worked`, '".hesk_dbEscape($sec_worked)."'), `merged`=CONCAT(`merged`,'".hesk_dbEscape($merged . '#')."'), `history`=CONCAT(`history`,'".hesk_dbEscape($history)."') WHERE `id`='".intval($merge_into)."' LIMIT 1");
+
+ return true;
+
+} // END hesk_mergeTickets()
+
+
+function hesk_updateStaffDefaults()
+{
+ global $hesk_settings, $hesklang;
+
+ // Demo mode
+ if ( defined('HESK_DEMO') )
+ {
+ return true;
+ }
+ // Remove the part that forces saving as default - we don't need it every time
+ $default_list = str_replace('&def=1','',$_SERVER['QUERY_STRING']);
+
+ // Update database
+ $res = hesk_dbQuery("UPDATE `".hesk_dbEscape($hesk_settings['db_pfix'])."users` SET `default_list`='".hesk_dbEscape($default_list)."' WHERE `id`='".intval($_SESSION['id'])."'");
+
+ // Update session values so the changes take effect immediately
+ $_SESSION['default_list'] = $default_list;
+
+ return true;
+
+} // END hesk_updateStaffDefaults()
+
+
+function hesk_makeJsString($in)
+{
+ return addslashes(preg_replace("/\s+/",' ',$in));
+} // END hesk_makeJsString()
+
+
+function hesk_checkNewMail()
+{
+ global $hesk_settings, $hesklang;
+
+ $res = hesk_dbQuery("SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."mail` WHERE `to`='".intval($_SESSION['id'])."' AND `read`='0' AND `deletedby`!='".intval($_SESSION['id'])."' ");
+ $num = hesk_dbResult($res,0,0);
+
+ return $num;
+} // END hesk_checkNewMail()
+
+
+function hesk_getCategoriesArray($kb = 0) {
+ global $hesk_settings, $hesklang, $hesk_db_link;
+
+ $categories = array();
+ if ($kb)
+ {
+ $result = hesk_dbQuery('SELECT `id`, `name` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'kb_categories` ORDER BY `cat_order` ASC');
+ }
+ else
+ {
+ $result = hesk_dbQuery('SELECT `id`, `name` FROM `'.hesk_dbEscape($hesk_settings['db_pfix']).'categories` ORDER BY `cat_order` ASC');
+ }
+
+ while ($row=hesk_dbFetchAssoc($result))
+ {
+ $categories[$row['id']] = $row['name'];
+ }
+
+ return $categories;
+} // END hesk_getCategoriesArray()
+
+
+function hesk_getHTML($in)
+{
+ global $hesk_settings, $hesklang;
+
+ $replace_from = array("\t","","$","<%","%>");
+ $replace_to = array("","<?","?>","\$","<%","%>");
+
+ $in = trim($in);
+ $in = str_replace($replace_from,$replace_to,$in);
+ $in = preg_replace('/\(.*)\<\/script\>/Uis',"",$in);
+ $in = preg_replace('/\<\!\-\-(.*)\-\-\>/Uis',"",$in);
+
+ if (HESK_SLASH === true)
+ {
+ $in = addslashes($in);
+ }
+ $in = str_replace('\"','"',$in);
+
+ return $in;
+} // END hesk_getHTML()
+
+
+function hesk_autoLogin($noredirect=0)
+{
+ global $hesk_settings, $hesklang, $hesk_db_link;
+
+ if (!$hesk_settings['autologin'])
+ {
+ return false;
+ }
+
+ $user = hesk_htmlspecialchars( hesk_COOKIE('hesk_username') );
+ $hash = hesk_htmlspecialchars( hesk_COOKIE('hesk_p') );
+ define('HESK_USER', $user);
+
+ if (empty($user) || empty($hash))
+ {
+ return false;
+ }
+
+ /* Login cookies exist, now lets limit brute force attempts */
+ hesk_limitBfAttempts();
+
+ /* Check username */
+ $result = hesk_dbQuery('SELECT * FROM `'.$hesk_settings['db_pfix']."users` WHERE `user` = '".hesk_dbEscape($user)."' LIMIT 1");
+ if (hesk_dbNumRows($result) != 1)
+ {
+ setcookie('hesk_username', '');
+ setcookie('hesk_p', '');
+ header('Location: index.php?a=login¬ice=1');
+ exit();
+ }
+
+ $res=hesk_dbFetchAssoc($result);
+ foreach ($res as $k=>$v)
+ {
+ $_SESSION[$k]=$v;
+ }
+
+ /* Check password */
+ if ($hash != hesk_Pass2Hash($_SESSION['pass'] . strtolower($user) . $_SESSION['pass']) )
+ {
+ setcookie('hesk_username', '');
+ setcookie('hesk_p', '');
+ header('Location: index.php?a=login¬ice=1');
+ exit();
+ }
+
+ /* Check if default password */
+ if ($_SESSION['pass'] == '499d74967b28a841c98bb4baaabaad699ff3c079')
+ {
+ hesk_process_messages($hesklang['chdp'],'NOREDIRECT','NOTICE');
+ }
+
+ unset($_SESSION['pass']);
+
+ /* Login successful, clean brute force attempts */
+ hesk_cleanBfAttempts();
+
+ /* Regenerate session ID (security) */
+ hesk_session_regenerate_id();
+
+ /* Get allowed categories */
+ if (empty($_SESSION['isadmin']))
+ {
+ $_SESSION['categories']=explode(',',$_SESSION['categories']);
+ }
+
+ /* Renew cookies */
+ setcookie('hesk_username', "$user", strtotime('+1 year'));
+ setcookie('hesk_p', "$hash", strtotime('+1 year'));
+
+ /* Close any old tickets here so Cron jobs aren't necessary */
+ if ($hesk_settings['autoclose'])
+ {
+ $revision = sprintf($hesklang['thist3'],hesk_date(),$hesklang['auto']);
+ $dt = date('Y-m-d H:i:s',time() - $hesk_settings['autoclose']*86400);
+
+ // Notify customer of closed ticket?
+ if ($hesk_settings['notify_closed'])
+ {
+ // Get list of tickets
+ $result = hesk_dbQuery("SELECT * FROM `".$hesk_settings['db_pfix']."tickets` WHERE `status` = '2' AND `lastchange` <= '".hesk_dbEscape($dt)."' ");
+ if (hesk_dbNumRows($result) > 0)
+ {
+ global $ticket;
+
+ // Load required functions?
+ if ( ! function_exists('hesk_notifyCustomer') )
+ {
+ require(HESK_PATH . 'inc/email_functions.inc.php');
+ }
+
+ while ($ticket = hesk_dbFetchAssoc($result))
+ {
+ $ticket['dt'] = hesk_date($ticket['dt'], true);
+ $ticket['lastchange'] = hesk_date($ticket['lastchange'], true);
+ hesk_notifyCustomer('ticket_closed');
+ }
+ }
+ }
+
+ // Update ticket statuses and history in database
+ hesk_dbQuery("UPDATE `".$hesk_settings['db_pfix']."tickets` SET `status`='3', `closedat`=NOW(), `closedby`='-1', `history`=CONCAT(`history`,'".hesk_dbEscape($revision)."') WHERE `status` = '2' AND `lastchange` <= '".hesk_dbEscape($dt)."' ");
+ }
+
+ /* If session expired while a HESK page is open just continue using it, don't redirect */
+ if ($noredirect)
+ {
+ return true;
+ }
+
+ /* Redirect to the destination page */
+ header('Location: ' . hesk_verifyGoto() );
+ exit();
+} // END hesk_autoLogin()
+
+
+function hesk_isLoggedIn()
+{
+ global $hesk_settings;
+
+ $referer = hesk_input($_SERVER['REQUEST_URI']);
+ $referer = str_replace('&','&',$referer);
+
+ if (empty($_SESSION['id']))
+ {
+ if ($hesk_settings['autologin'] && hesk_autoLogin(1) )
+ {
+ // Users online
+ if ($hesk_settings['online'])
+ {
+ require(HESK_PATH . 'inc/users_online.inc.php');
+ hesk_initOnline($_SESSION['id']);
+ }
+
+ return true;
+ }
+
+ $url = 'index.php?a=login¬ice=1&goto='.urlencode($referer);
+ header('Location: '.$url);
+ exit();
+ }
+ else
+ {
+ hesk_session_regenerate_id();
+
+ // Need to update permissions?
+ if ( empty($_SESSION['isadmin']) )
+ {
+ $res = hesk_dbQuery("SELECT `isadmin`, `categories`, `heskprivileges` FROM `".$hesk_settings['db_pfix']."users` WHERE `id` = '".intval($_SESSION['id'])."' LIMIT 1");
+ if (hesk_dbNumRows($res) == 1)
+ {
+ $me = hesk_dbFetchAssoc($res);
+ foreach ($me as $k => $v)
+ {
+ $_SESSION[$k]=$v;
+ }
+
+ // Get allowed categories
+ if (empty($_SESSION['isadmin']) )
+ {
+ $_SESSION['categories']=explode(',',$_SESSION['categories']);
+ }
+ }
+ else
+ {
+ hesk_session_stop();
+ $url = 'index.php?a=login¬ice=1&goto='.urlencode($referer);
+ header('Location: '.$url);
+ exit();
+ }
+ }
+
+ // Users online
+ if ($hesk_settings['online'])
+ {
+ require(HESK_PATH . 'inc/users_online.inc.php');
+ hesk_initOnline($_SESSION['id']);
+ }
+
+ return true;
+ }
+
+} // END hesk_isLoggedIn()
+
+
+function hesk_verifyGoto()
+{
+ // Default redirect URL
+ $url_default = 'admin_main.php';
+
+ // If no "goto" parameter is set, redirect to the default page
+ if ( ! hesk_isREQUEST('goto') )
+ {
+ return $url_default;
+ }
+
+ // Get the "goto" parameter
+ $url = hesk_REQUEST('goto');
+
+ // Fix encoded "&"
+ $url = str_replace('&', '&', $url);
+
+ // Parse the URL for verification
+ $url_parts = parse_url($url);
+
+ // The "path" part is required
+ if ( ! isset($url_parts['path']) )
+ {
+ return $url_default;
+ }
+
+ // Extract the file name from path
+ $url = basename($url_parts['path']);
+
+ // Allowed files for redirect
+ $OK_urls = array(
+ 'admin_main.php' => '',
+ 'admin_settings.php' => '',
+ 'admin_settings_save.php' => 'admin_settings.php',
+ 'admin_ticket.php' => '',
+ 'archive.php' => '',
+ 'assign_owner.php' => '',
+ 'change_status.php' => '',
+ 'edit_post.php' => '',
+ 'export.php' => '',
+ 'find_tickets.php' => '',
+ 'generate_spam_question.php' => '',
+ 'knowledgebase_private.php' => '',
+ 'lock.php' => '',
+ 'mail.php' => '',
+ 'manage_canned.php' => '',
+ 'manage_categories.php' => '',
+ 'manage_knowledgebase.php' => '',
+ 'manage_users.php' => '',
+ 'new_ticket.php' => '',
+ 'profile.php' => '',
+ 'reports.php' => '',
+ 'show_tickets.php' => '',
+ );
+
+ // URL must match one of the allowed ones
+ if ( ! isset($OK_urls[$url]) )
+ {
+ return $url_default;
+ }
+
+ // Modify redirect?
+ if ( strlen($OK_urls[$url]) )
+ {
+ $url = $OK_urls[$url];
+ }
+
+ // All OK, return the URL with query if set
+ return isset($url_parts['query']) ? $url.'?'.$url_parts['query'] : $url;
+
+} // END hesk_verifyGoto()
+
+
+function hesk_Pass2Hash($plaintext) {
+ $majorsalt = '';
+ $len = strlen($plaintext);
+ for ($i=0;$i<$len;$i++)
+ {
+ $majorsalt .= sha1(substr($plaintext,$i,1));
+ }
+ $corehash = sha1($majorsalt);
+ return $corehash;
+} // END hesk_Pass2Hash()
+
+
+function hesk_formatDate($dt, $from_database=true)
+{
+ $dt=hesk_date($dt, $from_database);
+ $dt=str_replace(' ','
',$dt); + return $dt; +} // End hesk_formatDate() + + +function hesk_jsString($str) +{ + $str = str_replace( array('\'','
') , array('\\\'','') ,$str); + $from = array("/\r\n|\n|\r/", '/\([^\<]*)\<\/a\>/i', '/\([^\<]*)\<\/a\>/i'); + $to = array("\\r\\n' + \r\n'", "$1", "$1"); + return preg_replace($from,$to,$str); +} // END hesk_jsString() + + +function hesk_myCategories($what='category') +{ + if ( ! empty($_SESSION['isadmin']) ) + { + return '1'; + } + else + { + return " `".hesk_dbEscape($what)."` IN ('" . implode("','", array_map('intval', $_SESSION['categories']) ) . "')"; + } +} // END hesk_myCategories() + + +function hesk_okCategory($cat,$error=1,$user_isadmin=false,$user_cat=false) +{ + global $hesklang; + + /* Checking for current user or someone else? */ + if ($user_isadmin === false) + { + $user_isadmin = $_SESSION['isadmin']; + } + + if ($user_cat === false) + { + $user_cat = $_SESSION['categories']; + } + + /* Is admin? */ + if ($user_isadmin) + { + return true; + } + /* Staff with access? */ + elseif (in_array($cat,$user_cat)) + { + return true; + } + /* No access */ + else + { + if ($error) + { + hesk_error($hesklang['not_authorized_tickets']); + } + else + { + return false; + } + } + +} // END hesk_okCategory() + + +function hesk_checkPermission($feature,$showerror=1) { + global $hesklang; + + /* Admins have full access to all features */ + if ($_SESSION['isadmin']) + { + return true; + } + + /* Check other staff for permissions */ + if (strpos($_SESSION['heskprivileges'], $feature) === false) + { + if ($showerror) + { + hesk_error($hesklang['no_permission'].'
+ NOW( ) THEN 1 ELSE 0 END) AS `banned` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape($ip)."' LIMIT 1"); + $res = hesk_dbQuery("SELECT `number`, (CASE WHEN `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL ".intval($hesk_settings['attempt_banmin'])." MINUTE ) > NOW() THEN 1 ELSE 0 END) AS `banned` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape($ip)."' LIMIT 1"); /* Not in the database yet? Add first one and return false */ if (hesk_dbNumRows($res) != 1) @@ -702,6 +773,9 @@ function hesk_process_messages($message,$redirect_to,$type='ERROR') case 'NOTICE': $_SESSION['HESK_NOTICE'] = TRUE; break; + case 'INFO': + $_SESSION['HESK_INFO'] = TRUE; + break; default: $_SESSION['HESK_ERROR'] = TRUE; } @@ -741,6 +815,10 @@ function hesk_handle_messages() { hesk_show_notice($_SESSION['HESK_MESSAGE']); } + elseif ( isset($_SESSION['HESK_INFO']) ) + { + hesk_show_info($_SESSION['HESK_MESSAGE']); + } hesk_cleanSessionVars('HESK_MESSAGE'); } @@ -749,6 +827,7 @@ function hesk_handle_messages() hesk_cleanSessionVars('HESK_ERROR'); hesk_cleanSessionVars('HESK_SUCCESS'); hesk_cleanSessionVars('HESK_NOTICE'); + hesk_cleanSessionVars('HESK_INFO'); // Secondary message if ( isset($_SESSION['HESK_2ND_NOTICE']) && isset($_SESSION['HESK_2ND_MESSAGE']) ) @@ -762,39 +841,54 @@ function hesk_handle_messages() } // END hesk_handle_messages() -function hesk_show_error($message,$title='') { +function hesk_show_error($message,$title='',$append_colon=true) { global $hesk_settings, $hesklang; $title = $title ? $title : $hesklang['error']; + $title = $append_colon ? $title . ':' : $title; ?>
+
+ + +<?php echo (isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?>
+
-
+
@@ -59,7 +60,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
-
+
@@ -127,6 +128,12 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
$onload .= "ss();";
}
}
+
+ // Use ReCaptcha API v2?
+ if (defined('RECAPTCHA'))
+ {
+ echo '';
+ }
?>
diff --git a/inc/headerAdmin.inc.php b/inc/headerAdmin.inc.php
index 1088af73..94fdb109 100644
--- a/inc/headerAdmin.inc.php
+++ b/inc/headerAdmin.inc.php
@@ -42,10 +42,11 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
<?php echo (isset($hesk_settings['tmp_title']) ? $hesk_settings['tmp_title'] : $hesk_settings['hesk_title']); ?>
+
-
+
-
+
@@ -59,7 +60,7 @@ require(HESK_PATH . 'modsForHesk_settings.inc.php');
-
+
diff --git a/inc/knowledgebase_functions.inc.php b/inc/knowledgebase_functions.inc.php
index 1796c358..87068dca 100644
--- a/inc/knowledgebase_functions.inc.php
+++ b/inc/knowledgebase_functions.inc.php
@@ -1,7 +1,7 @@
$v)
+{
+ if ($v['use'])
+ {
+ $sql_final .= ", `".$k."`";
+ }
+}
+
+$sql_final.= " FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE ";
// This code will be used to count number of results
$sql_count = "SELECT COUNT(*) FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."tickets` WHERE ";
@@ -87,11 +122,15 @@ while ($row = $results->fetch_assoc())
}
$status = $possible_status;
-foreach ($status as $k => $v)
+// Process statuses unless overridden with "s_all" variable
+if ( ! hesk_GET('s_all') )
{
- if (empty($_GET['s'.$k]))
+ foreach ($status as $k => $v)
{
- unset($status[$k]);
+ if (empty($_GET['s' . $k]))
+ {
+ unset($status[$k]);
+ }
}
}
diff --git a/inc/profile_functions.inc.php b/inc/profile_functions.inc.php
new file mode 100644
index 00000000..225fb204
--- /dev/null
+++ b/inc/profile_functions.inc.php
@@ -0,0 +1,382 @@
+
+
+
+
+
+
+';
+ hesk_show_notice($hesklang['mma2'], $hesklang['mma1'], false);
+ echo '- '.$hesk_error_buffer.'
- +
@@ -496,6 +681,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
-
-
-
- +
+
+
' : ''; + + $att = explode(',', substr($note['attachments'], 0, -1) ); + $num = count($att); + foreach ($att as $myatt) + { + list($att_id, $att_name) = explode('#', $myatt); + + // Can edit and delete note (attachments)? + if ($can_del_notes || $note['who'] == $_SESSION['id']) + { + // If this is the last attachment and no message, show "delete ticket" link + if ($num == 1 && strlen($note['message']) == 0) + { + echo ' + + '; + } + // Show "delete attachment" link + else + { + echo ' + + '; + } + } + + echo ' + + + + '.$att_name.'
+ '; + } + } + ?> +
+
+ -
+' : ''; + + $att = explode(',', substr($note['attachments'], 0, -1) ); + $num = count($att); + foreach ($att as $myatt) + { + list($att_id, $att_name) = explode('#', $myatt); + + // Can edit and delete note (attachments)? + if ($can_del_notes || $note['who'] == $_SESSION['id']) + { + // If this is the last attachment and no message, show "delete ticket" link + if ($num == 1 && strlen($note['message']) == 0) + { + echo ' + + '; + } + // Show "delete attachment" link + else + { + echo ' + + '; + } + } + + echo ' + + + + '.$att_name.'
+ '; + } + } + ?> +
'.$article['subject'].'
@@ -258,6 +258,51 @@ function hesk_show_kb_article($artid) echo ''; } + // TODO Check how this looks + // Related articles + if ($hesk_settings['kb_related']) + { + require(HESK_PATH . 'inc/mail/email_parser.php'); + + $query = hesk_dbEscape( $article['subject'] . ' ' . convert_html_to_text($article['content']) ); + + // Get relevant articles from the database + $res = hesk_dbQuery("SELECT `id`, `subject`, MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') AS `score` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_articles` WHERE `type` IN ('0','1') AND MATCH(`subject`,`content`,`keywords`) AGAINST ('{$query}') LIMIT ".intval($hesk_settings['kb_related']+1)); + + // Array with related articles + $related_articles = array(); + + while ($related = hesk_dbFetchAssoc($res)) + { + // Get base match score from the first (this) article + if ( ! isset($base_score) ) + { + $base_score = $related['score']; + continue; + } + + // Stop when articles reach less than 10% of base score + if ($related['score'] / $base_score < 0.10) + { + break; + } + + // This is a valid related article + $related_articles[$related['id']] = $related['subject']; + } + + // Print related articles if we have any valid matches + if ( count($related_articles) ) + { + echo ''; + } + } + if ($article['catid']==1) { @@ -322,7 +367,7 @@ function hesk_show_kb_category($catid, $is_search = 0) { } } - $res = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `id`='".intval($catid)."' LIMIT 1"); + $res = hesk_dbQuery("SELECT `name`,`parent` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `id`='".intval($catid)."' LIMIT 1"); $thiscat = hesk_dbFetchAssoc($res) or hesk_error($hesklang['kb_cat_inv']); if ($thiscat['parent']) @@ -333,7 +378,7 @@ function hesk_show_kb_category($catid, $is_search = 0) { '; } - $result = hesk_dbQuery("SELECT * FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `parent`='".intval($catid)."' ORDER BY `parent` ASC, `cat_order` ASC"); + $result = hesk_dbQuery("SELECT `id`,`name`,`articles`,`type` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."kb_categories` WHERE `parent`='".intval($catid)."' ORDER BY `parent` ASC, `cat_order` ASC"); if (hesk_dbNumRows($result) > 0) { ?> @@ -442,7 +487,7 @@ function hesk_show_kb_category($catid, $is_search = 0) {| - | + | - | + '.$hesklang['ts'].''; + } + ?> | - | + '.$totals['worked'].''; + } + ?> | - | + '.$d['worked'].''; + } + ?> | - | + '.$totals['worked'].''; + } + ?> |
|---|
| - | - | + | + '.$hesklang['ts'].''; + } + ?> | - | + '.$totals['worked'].''; + } + ?> | - | + '.$d['worked'].''; + } + ?> | - | + '.$d['worked'].''; + } + ?> |
|---|
| - | - | + | + '.$hesklang['ts'].''; + } + ?> | - | + '.$totals['worked'].''; + } + ?> | - | + '.$d['worked'].''; + } + ?> | - | + '.$totals['worked'].''; + } + ?> |
|---|
+
+
+
+ 4 || $style < 0)
+ {
+ $style = 0;
+ }
+
+ $type = empty($_POST['type']) ? 0 : 1;
+ $title = hesk_input( hesk_POST('title') ) or $hesk_error_buffer[] = $hesklang['sm_e_title'];
+ $message = hesk_getHTML( hesk_POST('message') );
+
+ // Any errors?
+ if (count($hesk_error_buffer))
+ {
+ $_SESSION['edit_sm'] = true;
+ $hesklang['new_sm'] = $hesklang['edit_sm'];
+
+ $_SESSION['new_sm'] = array(
+ 'id' => $id,
+ 'style' => $style,
+ 'type' => $type,
+ 'title' => $title,
+ 'message' => hesk_input( hesk_POST('message') ),
+ );
+
+ $tmp = '';
+ foreach ($hesk_error_buffer as $error)
+ {
+ $tmp .= "
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '.$hesklang['no_sm'].'';
+ }
+ else
+ {
+ // List of staff
+ if ( ! isset($admins) )
+ {
+ $admins = array();
+ $res2 = hesk_dbQuery("SELECT `id`,`name` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."users`");
+ while ($row=hesk_dbFetchAssoc($res2))
+ {
+ $admins[$row['id']]=$row['name'];
+ }
+ }
+
+ ?>
+
+
+
+
+ | + | + | + | + |
|---|---|---|---|
|
+
+
+
+
+ |
+ + | + |
+ 1)
+ {
+ if ($k == 1)
+ {
+ ?>
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+ - '.$hesk_error_buffer.'
- '.$hesk_error_buffer.'
',$dt); + return $dt; +} // End hesk_formatDate() + + +function hesk_jsString($str) +{ + $str = str_replace( array('\'','
') , array('\\\'','') ,$str); + $from = array("/\r\n|\n|\r/", '/\([^\<]*)\<\/a\>/i', '/\([^\<]*)\<\/a\>/i'); + $to = array("\\r\\n' + \r\n'", "$1", "$1"); + return preg_replace($from,$to,$str); +} // END hesk_jsString() + + +function hesk_myCategories($what='category') +{ + if ( ! empty($_SESSION['isadmin']) ) + { + return '1'; + } + else + { + return " `".hesk_dbEscape($what)."` IN ('" . implode("','", array_map('intval', $_SESSION['categories']) ) . "')"; + } +} // END hesk_myCategories() + + +function hesk_okCategory($cat,$error=1,$user_isadmin=false,$user_cat=false) +{ + global $hesklang; + + /* Checking for current user or someone else? */ + if ($user_isadmin === false) + { + $user_isadmin = $_SESSION['isadmin']; + } + + if ($user_cat === false) + { + $user_cat = $_SESSION['categories']; + } + + /* Is admin? */ + if ($user_isadmin) + { + return true; + } + /* Staff with access? */ + elseif (in_array($cat,$user_cat)) + { + return true; + } + /* No access */ + else + { + if ($error) + { + hesk_error($hesklang['not_authorized_tickets']); + } + else + { + return false; + } + } + +} // END hesk_okCategory() + + +function hesk_checkPermission($feature,$showerror=1) { + global $hesklang; + + /* Admins have full access to all features */ + if ($_SESSION['isadmin']) + { + return true; + } + + /* Check other staff for permissions */ + if (strpos($_SESSION['heskprivileges'], $feature) === false) + { + if ($showerror) + { + hesk_error($hesklang['no_permission'].'
'.$hesklang['click_login'].''); + } + else + { + return false; + } + } + else + { + return true; + } + +} // END hesk_checkPermission() diff --git a/inc/common.inc.php b/inc/common.inc.php index 1ba32f78..f0548935 100644 --- a/inc/common.inc.php +++ b/inc/common.inc.php @@ -1,7 +1,7 @@ +
+ '; ?>
+
+
+ + NOW( ) THEN 1 ELSE 0 END) AS `banned` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape($ip)."' LIMIT 1"); + $res = hesk_dbQuery("SELECT `number`, (CASE WHEN `last_attempt` IS NOT NULL AND DATE_ADD(`last_attempt`, INTERVAL ".intval($hesk_settings['attempt_banmin'])." MINUTE ) > NOW() THEN 1 ELSE 0 END) AS `banned` FROM `".hesk_dbEscape($hesk_settings['db_pfix'])."logins` WHERE `ip`='".hesk_dbEscape($ip)."' LIMIT 1"); /* Not in the database yet? Add first one and return false */ if (hesk_dbNumRows($res) != 1) @@ -702,6 +773,9 @@ function hesk_process_messages($message,$redirect_to,$type='ERROR') case 'NOTICE': $_SESSION['HESK_NOTICE'] = TRUE; break; + case 'INFO': + $_SESSION['HESK_INFO'] = TRUE; + break; default: $_SESSION['HESK_ERROR'] = TRUE; } @@ -741,6 +815,10 @@ function hesk_handle_messages() { hesk_show_notice($_SESSION['HESK_MESSAGE']); } + elseif ( isset($_SESSION['HESK_INFO']) ) + { + hesk_show_info($_SESSION['HESK_MESSAGE']); + } hesk_cleanSessionVars('HESK_MESSAGE'); } @@ -749,6 +827,7 @@ function hesk_handle_messages() hesk_cleanSessionVars('HESK_ERROR'); hesk_cleanSessionVars('HESK_SUCCESS'); hesk_cleanSessionVars('HESK_NOTICE'); + hesk_cleanSessionVars('HESK_INFO'); // Secondary message if ( isset($_SESSION['HESK_2ND_NOTICE']) && isset($_SESSION['HESK_2ND_MESSAGE']) ) @@ -762,39 +841,54 @@ function hesk_handle_messages() } // END hesk_handle_messages() -function hesk_show_error($message,$title='') { +function hesk_show_error($message,$title='',$append_colon=true) { global $hesk_settings, $hesklang; $title = $title ? $title : $hesklang['error']; + $title = $append_colon ? $title . ':' : $title; ?>
- :
+
- :
+
- :
+
- +
+ 
+
+
+
+
+ + + +
+
+
+
+ +
+ Verify email
'verify_email' => $hesklang['verify_email'],
+ // --> Ticket closed
+ 'ticket_closed' => $hesklang['ticket_closed'],
+
/*** Emails sent to STAFF ***/
@@ -265,6 +268,9 @@ function hesk_validEmails()
// --> New note by someone to a ticket assigned to you
'new_note' => $hesklang['new_note'],
+ // --> Staff password reset email
+ 'reset_password' => $hesklang['reset_password'],
+
);
} // END hesk_validEmails()
@@ -585,6 +591,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('%%ID%%', $ticket['id'] ,$msg);
/* All custom fields */
foreach ($hesk_settings['custom_fields'] as $k=>$v)
diff --git a/inc/header.inc.php b/inc/header.inc.php
index 6f440217..baa5fe71 100644
--- a/inc/header.inc.php
+++ b/inc/header.inc.php
@@ -1,7 +1,7 @@
-
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ '.$hesklang['astaff'].' '.$hesklang['staff_can'];
+ }
+ ?>
+
+
+
+
+
+
+
+ $catname)
+ {
+ echo ' ';
+ }
+ ?>
+
+
+
+
+
+
';
+ }
+ ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
';
+ hesk_show_notice($hesklang['kbo2'], $hesklang['kbo1'], false);
+ echo '
';
+}
+?>