Closes #144 Updated to HESK 2.6.1

merge-requests/2/head
Mike Koch 9 years ago
parent dbc5868f27
commit 8e585cd262

@ -306,7 +306,7 @@ $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);
$set['pop3_job_wait'] = hesk_checkMinMax( intval( hesk_POST('s_pop3_job_wait') ) , 0, 1440, 15);
// Test POP3 connection
$pop3_OK = hesk_testPOP3(true);

@ -400,13 +400,9 @@ function hesk_autoLogin($noredirect=0)
}
$res=hesk_dbFetchAssoc($result);
foreach ($res as $k=>$v)
{
$_SESSION[$k]=$v;
}
/* Check password */
if ($hash != hesk_Pass2Hash($_SESSION['pass'] . strtolower($user) . $_SESSION['pass']) )
if ($hash != hesk_Pass2Hash($res['pass'] . strtolower($user) . $res['pass']) )
{
setcookie('hesk_username', '');
setcookie('hesk_p', '');
@ -414,6 +410,12 @@ function hesk_autoLogin($noredirect=0)
exit();
}
// Set user details
foreach ($res as $k=>$v)
{
$_SESSION[$k]=$v;
}
/* Check if default password */
if ($_SESSION['pass'] == '499d74967b28a841c98bb4baaabaad699ff3c079')
{

Loading…
Cancel
Save