Merge pull request #850 from toseppo/patch-1

Fix user login / edit set cookies
This commit is contained in:
HB9HIL
2024-09-05 19:38:05 +02:00
committed by GitHub

View File

@@ -661,7 +661,7 @@ class User extends CI_Controller {
'name' => $this->config->item('gettext_cookie', 'gettext'),
'value' => $this->input->post('user_language', true),
'expire' => time()+1000,
'expire' => 1000,
'secure' => FALSE
);
@@ -854,7 +854,7 @@ class User extends CI_Controller {
log_message('debug', "User ID: [$uid] Login rejected because of an active maintenance mode (and he is no admin).");
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->input->set_cookie('keep_login', '', -3600, '');
redirect('user/login');
}
@@ -863,7 +863,7 @@ class User extends CI_Controller {
log_message('debug', "User ID: [$uid] Login rejected because of non matching hash key ('Keep Login').");
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->input->set_cookie('keep_login', '', -3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
}
@@ -872,7 +872,7 @@ class User extends CI_Controller {
log_message('error', "User ID: [".$uid."]; 'Keep Login' failed. Cookie deleted. Message: ".$e);
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->input->set_cookie('keep_login', '', -3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
@@ -894,7 +894,7 @@ class User extends CI_Controller {
'name' => $this->config->item('gettext_cookie', 'gettext'),
'value' => $data['user']->user_language,
'expire' => time()+1000,
'expire' => 1000,
'secure' => FALSE
);
@@ -908,7 +908,7 @@ class User extends CI_Controller {
$cookie = array(
'name' => 'keep_login',
'value' => $encrypted_string,
'expire' => '2592000', // 30 days
'expire' => 2592000, // 30 days
'secure' => TRUE,
'httponly' => TRUE
);
@@ -935,7 +935,7 @@ class User extends CI_Controller {
$user_name = $this->session->userdata('user_name');
// Delete keep_login cookie
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->input->set_cookie('keep_login', '', -3600, '');
$this->user_model->clear_session();