Impliments a simple remember me feature for 14 days
Starts to impliment #3087 this has a remember me for 14 days
这个提交包含在:
父节点
93bcc979ab
当前提交
471c83a8b8
共有 17 个文件被更改,包括 50 次插入 和 1 次删除
|
|
@ -877,6 +877,8 @@ class User extends CI_Controller {
|
|||
function login() {
|
||||
// Check our version and run any migrations
|
||||
$this->load->library('Migration');
|
||||
$this->load->library('encrypt');
|
||||
|
||||
$this->migration->current();
|
||||
|
||||
$this->load->model('user_model');
|
||||
|
|
@ -889,6 +891,16 @@ class User extends CI_Controller {
|
|||
|
||||
$data['user'] = $query->row();
|
||||
|
||||
// Read the cookie remeber_me and log the user in
|
||||
if($this->input->cookie('remember_me')) {
|
||||
$encrypted_string = $this->input->cookie('remember_me');
|
||||
$decrypted_string = $this->encrypt->decode($encrypted_string);
|
||||
$this->user_model->update_session($decrypted_string);
|
||||
$this->user_model->set_last_login($decrypted_string);
|
||||
// set a debug message
|
||||
$this->session->set_flashdata('notice', 'User logged in');
|
||||
redirect('dashboard');
|
||||
}
|
||||
|
||||
if ($this->form_validation->run() == FALSE) {
|
||||
$data['page_title'] = "Login";
|
||||
|
|
@ -910,6 +922,19 @@ class User extends CI_Controller {
|
|||
|
||||
);
|
||||
$this->input->set_cookie($cookie);
|
||||
|
||||
// Create a remember me cookie
|
||||
if($this->input->post('remember_me') == '1') {
|
||||
$encrypted_string = $this->encrypt->encode($data['user']->user_id);
|
||||
|
||||
$cookie= array(
|
||||
'name' => 'remember_me',
|
||||
'value' => $encrypted_string,
|
||||
'expire' => '1209600',
|
||||
'secure' => FALSE
|
||||
);
|
||||
$this->input->set_cookie($cookie);
|
||||
}
|
||||
redirect('dashboard');
|
||||
} else {
|
||||
$this->session->set_flashdata('error', 'Incorrect username or password!');
|
||||
|
|
@ -923,6 +948,9 @@ class User extends CI_Controller {
|
|||
|
||||
$user_name = $this->session->userdata('user_name');
|
||||
|
||||
// Delete remember_me cookie
|
||||
setcookie('remember_me', '', time() - 3600, '/');
|
||||
|
||||
$this->user_model->clear_session();
|
||||
|
||||
$this->session->set_flashdata('notice', 'User '.$user_name.' logged out.');
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Избор за колона 5 (само за
|
|||
|
||||
$lang['account_create_user_account'] = 'Create User Account';
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = '第5列(仅日志页面展示)';
|
|||
|
||||
$lang['account_create_user_account'] = '创建账户';
|
||||
$lang['account_edit_account'] = '编辑账户';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = '账户信息';
|
||||
$lang['account_user'] = "用户";
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ $lang['account_column5_text'] = 'Vybrat sloupec 5 (pouze pro deník)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Vytvořit uživatelský účet';
|
||||
$lang['account_edit_account'] = 'Upravit účet';
|
||||
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
$lang['account_account_information'] = 'Informace o účtu';
|
||||
$lang['account_user'] = "User";
|
||||
$lang['account_word_edited'] = "edited";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Choose column 5 (only for logbook)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Create User Account';
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -133,3 +133,5 @@ $lang['account_hamsat_private_feed_key'] = "Private Feed Key";
|
|||
$lang['account_hamsat_hint'] = "See your profile at <a href='https://hams.at/users/settings' target='_blank'>https://hams.at/users/settings</a>.";
|
||||
$lang['account_hamsat_workable_only'] = "Show Workable Passes Only";
|
||||
$lang['account_hamsat_workable_only_hint'] = "If enabled shows only workable passes based on the gridsquare set in your hams.at account. Requires private feed key to be set.";
|
||||
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Sarake 5 (vain lokikirjassa)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Luo käyttäjätili';
|
||||
$lang['account_edit_account'] = 'Muokkaa käyttäjätiliä';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = "Contenu colonne 5 (uniquement pour logbook)";
|
|||
|
||||
$lang['account_create_user_account'] = "Créer un compte";
|
||||
$lang['account_edit_account'] = "Editer un compte";
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Compte";
|
||||
$lang['account_user'] = "Compte";
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ $lang['account_column2_text'] = 'Wähle Spalte 2';
|
|||
$lang['account_column3_text'] = 'Wähle Spalte 3';
|
||||
$lang['account_column4_text'] = 'Wähle Spalte 4';
|
||||
$lang['account_column5_text'] = 'Wähle Spalte 5 (nur für Logbuch)';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_create_user_account'] = 'Benutzerkonto anlegen';
|
||||
$lang['account_edit_account'] = 'Benutzerkonto editieren';
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Επιλογή στήλης 5 (Μόνο για
|
|||
|
||||
$lang['account_create_user_account'] = "Create User Account";
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Scegli colonna 5 (solo per il logbook)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Create User Account';
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Kolumna 5 (tylko dla logu)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Create User Account';
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Выберите столбец 5 (только
|
|||
|
||||
$lang['account_create_user_account'] = ' Создать аккаунт пользователя';
|
||||
$lang['account_edit_account'] = 'Редактировать аккаунт';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = 'Информация об аккаунте';
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Columna 5 (solo en libro de guardia)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Crear Cuenta de Usuario';
|
||||
$lang['account_edit_account'] = 'Editar Cuenta';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = 'Información de la Cuenta';
|
||||
$lang['account_user'] = "Usuario";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = 'Välj kolumn 5 (bara för logbok)';
|
|||
|
||||
$lang['account_create_user_account'] = 'Skapa användarkonto';
|
||||
$lang['account_edit_account'] = 'Redigera användarkonto';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = 'Användarkontoinformation';
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ $lang['account_column5_text'] = '5. sütunu seçin (sadece kayıt defteri için)
|
|||
|
||||
$lang['account_create_user_account'] = 'Create User Account';
|
||||
$lang['account_edit_account'] = 'Edit Account';
|
||||
$lang['account_remember_me'] = 'Remember me';
|
||||
|
||||
$lang['account_account_information'] = "Account";
|
||||
$lang['account_user'] = "User";
|
||||
|
|
|
|||
|
|
@ -51,6 +51,12 @@ body {
|
|||
placeholder="<?php echo lang('account_password'); ?>">
|
||||
</div>
|
||||
|
||||
<!-- build a remember me checkbox -->
|
||||
<div class="checkbox mb-3">
|
||||
<label>
|
||||
<input type="checkbox" name="remember_me" value="1"> <?php echo lang('account_remember_me'); ?>
|
||||
</label>
|
||||
|
||||
<div>
|
||||
<p><small><a class="" href="<?php echo site_url('user/forgot_password'); ?>"><?php echo lang('account_forgot_your_password'); ?></a></small></p>
|
||||
</div>
|
||||
|
|
|
|||
正在加载…
在新工单中引用