Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update admin_functions

Browse Source
This commit is contained in:
Mike Koch 2016-10-22 21:45:41 -04:00
parent a960a09892
commit 34cf3106d0
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
inc/admin_functions.inc.php
View File

@ -51,13 +51,6 @@ $hesk_settings['possible_ticket_list'] = array(
'time_worked' => $hesklang['ts'], '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 ***/ /*** FUNCTIONS ***/
@ -393,8 +386,8 @@ function hesk_autoLogin($noredirect = 0)
/* Check username */ /* Check username */
$result = hesk_dbQuery('SELECT * FROM `' . $hesk_settings['db_pfix'] . "users` WHERE `user` = '" . hesk_dbEscape($user) . "' LIMIT 1"); $result = hesk_dbQuery('SELECT * FROM `' . $hesk_settings['db_pfix'] . "users` WHERE `user` = '" . hesk_dbEscape($user) . "' LIMIT 1");
if (hesk_dbNumRows($result) != 1) { if (hesk_dbNumRows($result) != 1) {
setcookie('hesk_username', ''); hesk_setcookie('hesk_username', '');
setcookie('hesk_p', ''); hesk_setcookie('hesk_p', '');
header('Location: '.$url); header('Location: '.$url);
exit(); exit();
} }
@ -403,8 +396,8 @@ function hesk_autoLogin($noredirect = 0)
/* Check password */ /* Check password */
if ($hash != hesk_Pass2Hash($res['pass'] . strtolower($user) . $res['pass'])) { if ($hash != hesk_Pass2Hash($res['pass'] . strtolower($user) . $res['pass'])) {
setcookie('hesk_username', ''); hesk_setcookie('hesk_username', '');
setcookie('hesk_p', ''); hesk_setcookie('hesk_p', '');
header('Location: '.$url); header('Location: '.$url);
exit(); exit();
} }
@ -437,8 +430,8 @@ function hesk_autoLogin($noredirect = 0)
} }
/* Renew cookies */ /* Renew cookies */
setcookie('hesk_username', "$user", strtotime('+1 year')); hesk_setcookie('hesk_username', "$user", strtotime('+1 year'));
setcookie('hesk_p', "$hash", strtotime('+1 year')); hesk_setcookie('hesk_p', "$hash", strtotime('+1 year'));
/* Close any old tickets here so Cron jobs aren't necessary */ /* Close any old tickets here so Cron jobs aren't necessary */
if ($hesk_settings['autoclose']) { if ($hesk_settings['autoclose']) {
@ -646,7 +639,8 @@ function hesk_formatDate($dt, $from_database = true)
function hesk_jsString($str) function hesk_jsString($str)
{ {
$str = str_replace(array('\'', '<br />'), array('\\\'', ''), $str); $str = addslashes($str);
$str = str_replace('<br />' , '' , $str);
$from = array("/\r\n|\n|\r/", '/\<a href="mailto\:([^"]*)"\>([^\<]*)\<\/a\>/i', '/\<a href="([^"]*)" target="_blank"\>([^\<]*)\<\/a\>/i'); $from = array("/\r\n|\n|\r/", '/\<a href="mailto\:([^"]*)"\>([^\<]*)\<\/a\>/i', '/\<a href="([^"]*)" target="_blank"\>([^\<]*)\<\/a\>/i');
$to = array("\\r\\n' + \r\n'", "$1", "$1"); $to = array("\\r\\n' + \r\n'", "$1", "$1");
return preg_replace($from, $to, $str); return preg_replace($from, $to, $str);