Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #742 from HB9HIL/cookies

Browse Source 
Cookies Fix
This commit is contained in:
HB9HIL
2024-08-13 21:50:36 +02:00
committed by GitHub
parent 5407da2434 f027763ca9
commit 0fefb205d9
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/controllers/User.php
View File

@@ -635,7 +635,7 @@ class User extends CI_Controller {
if ($this->session->userdata('user_id') == $this->uri->segment(3)) { // Editing own User? Set cookie!
$cookie= array(
'name' => 'language',
'name' => $this->config->item('gettext_cookie', 'gettext'),
'value' => $this->input->post('user_language', true),
'expire' => time()+1000,
'secure' => FALSE
@@ -830,7 +830,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
setcookie('keep_login', '', time() - 3600, '/');
$this->input->set_cookie('keep_login', '', time() - 3600, '');
redirect('user/login');
}
@@ -839,7 +839,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
setcookie('keep_login', '', time() - 3600, '/');
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
}
@@ -848,7 +848,7 @@ class User extends CI_Controller {
log_message('error', "User ID: [".$uid."]; 'Keep Login' failed. Cookie deleted. Message: ".$e);
// Delete keep_login cookie
setcookie('keep_login', '', time() - 3600, '/');
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->session->set_flashdata('error', __("Login failed. Try again."));
redirect('user/login');
@@ -869,7 +869,7 @@ class User extends CI_Controller {
$this->user_model->update_session($data['user']->user_id);
$cookie= array(
'name' => 'language',
'name' => $this->config->item('gettext_cookie', 'gettext'),
'value' => $data['user']->user_language,
'expire' => time()+1000,
'secure' => FALSE
@@ -912,7 +912,7 @@ class User extends CI_Controller {
$user_name = $this->session->userdata('user_name');
// Delete keep_login cookie
setcookie('keep_login', '', time() - 3600, '/');
$this->input->set_cookie('keep_login', '', time() - 3600, '');
$this->user_model->clear_session();

6
application/hooks/gettext/Gettext.php
View File

@@ -279,7 +279,7 @@ class Gettext
$folder = NULL;
// Check if any cookie is set
if ($cookie = $IN->cookie(config_item('cookie_prefix').$this->config['cookie'], TRUE))
if ($cookie = $IN->cookie($this->config['cookie'], TRUE))
{
$folder = $cookie;
}
@@ -308,7 +308,7 @@ class Gettext
// Use cookie if enabled
if ( ! empty($this->config['cookie']))
{
$IN->set_cookie($this->config['cookie'], $current['folder'], 2678400);
$IN->set_cookie(str_replace(config_item('cookie_prefix'), '', $this->config['cookie']), $current['folder'], 2678400);
}
// In case we use session
@@ -401,7 +401,7 @@ class Gettext
// If the use of cookies is ON
if ($this->config['cookie'] !== NULL)
{
$IN->set_cookie($this->config['cookie'], $lang['folder'], 2678400);
$IN->set_cookie(str_replace(config_item('cookie_prefix'), '', $this->config['cookie']), $lang['folder'], 2678400);
}
// In case COOKIE are off but SESSION is on

2
application/views/debug/index.php
View File

@@ -29,7 +29,7 @@
</tr>
<tr>
<td><?= __("Language"); ?></td>
<td><?php echo ucfirst($this->config->item('language')) . "\n"; ?></td>
<td><?php echo __(ucfirst($this->config->item('language'))) . "\n"; ?></td>
</tr>
<tr>
<td><?= __("Base URL"); ?></td>