jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug/profile' into 'main'

Browse Source 
Arreglado el bug, habia parametros de mas en el metodo store(

See merge request jjimenez/safekat!195
This commit is contained in:
Ignacio Martinez Navajas
2024-04-01 12:55:11 +00:00
parent b5899d7663 a954ac275e
commit d500a6e0ae
2 changed files with 48 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
ci4/app/Controllers/Profile.php
View File

@ -103,65 +103,36 @@ class Profile extends BaseController
public function store()
{
//Demo Mode
if(env('demo.mode')??false){
session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
return redirect()->to('/profile');
}
$session = session();
helper('form');
$password = 'max_length[35]';
$confirm_password = 'max_length[35]';
if(!empty($this->request->getPost('password'))){
$password = 'required|min_length[8]';
$confirm_password = 'matches[password]';
}
$rules = [
'first_name' => 'required',
'last_name' => 'required',
'password' => $password,
'confirm_password' => $confirm_password
];
$rules_error = [
'first_name' => ['required' => lang("App.profile_rules_first_name_r")],
'last_name' => ['required' => lang("App.profile_rules_last_name_r")],
'password' => [
'required' => lang("App.profile_rules_password_r"),
'min_length' => lang("App.profile_rules_password_m")
],
'confirm_password' => ['matches' => lang("App.profile_rules_password_confirm_m")]
];
if(empty($this->request->getPost('tfa_secret'))){
if ($this->validate($rules ?? [], $rules_error ?? [])) {
if (!empty($this->id_user)) {
$date_birth = !empty($this->request->getPost('date_birth')??'') ? dateFormatMysql($this->request->getPost('date_birth')):null;
$this->user_model->save([
'id_user' => $this->id_user,
'first_name' => $this->request->getPost('first_name'),
'last_name' => $this->request->getPost('last_name'),
'date_birth' => $date_birth,
'address' => $this->request->getPost('address'),
'city' => $this->request->getPost('city'),
'state' => $this->request->getPost('state'),
'country' => $this->request->getPost('country'),
'zip_code' => $this->request->getPost('zip_code'),
'mobile' => $this->request->getPost('mobile'),
'language' => $this->request->getPost('language')
]);
$session->set('lang', $this->request->getPost('language') ?? 'en');
if(!empty($this->request->getPost('password'))){
$phpass = new PasswordHash(8, true);
$this->user_model->save([
'id_user' => $this->id_user,
'password' => $phpass->HashPassword($this->request->getPost('password')),
]);
}
$session->setFlashdata('sweet', ['success', lang("App.global_alert_save_success")]);
} else {
$session->setFlashdata('sweet', ['error', lang("App.global_alert_save_error")]);
@ -171,24 +142,8 @@ class Profile extends BaseController
$session->setFlashdata('error', 'error');
return $this->index();
}
}else{
if($this->request->getPost('tfa') == 'on'){
$this->user_model->save([
'id_user' => $this->id_user,
'tfa' => true,
'tfa_secret' => $this->request->getPost('tfa_secret'),
'tfa_code' => $this->request->getPost('tfa_code')
]);
}else{
$this->user_model->save([
'id_user' => $this->id_user,
'tfa' => false,
'tfa_secret' => '',
'tfa_code' => ''
]);
}
$session->setFlashdata('sweet', ['success',lang("App.global_alert_save_success")]);
}
return redirect()->to('/profile');
}
}

20
ci4/app/Views/themes/backend/vuexy/form/profile/index.php
View File

@ -88,20 +88,9 @@
value="<?= (isset($obj)) ? $obj->email : set_value('email'); ?>"
/>
</div>
<div class="mb-3 col-md-6">
<label for="organization" class="form-label">Organization</label>
<input
type="text"
class="form-control"
id="organization"
name="organization"
value="Pixinvent"
/>
</div>
<div class="mb-3 col-md-6">
<label class="form-label" for="mobile"><?= lang("App.profile_mobile") ?></label>
<div class="input-group input-group-merge">
<span class="input-group-text">US (+1)</span>
<input
type="text"
id="mobile"
@ -162,7 +151,6 @@
<option value=""><?= lang("App.global_select") ?></option>
<option value="en" <?= $id_select == "en" ? 'selected' : '' ?>><?= lang("App.lang_en") ?></option>
<option value="es" <?= $id_select == "es" ? 'selected' : '' ?>><?= lang("App.lang_es") ?></option>
<option value="pt" <?= $id_select == "pt" ? 'selected' : '' ?>><?= lang("App.lang_pt") ?></option>
</select>
</div>
</div>
@ -175,7 +163,7 @@
<!-- /Account -->
</div>
<div class="card">
<!-- <div class="card">
<h5 class="card-header">Delete Account</h5>
<div class="card-body">
<div class="mb-3 col-12 mb-0">
@ -199,7 +187,7 @@
<button type="submit" class="btn btn-danger deactivate-account">Deactivate Account</button>
</form>
</div>
</div>
</div> -->
</div>
@ -295,10 +283,6 @@
"use strict";
$(document).ready(function () {
$('#first_name').focus();
$('#date_birth').bootstrapMaterialDatePicker({
format: '<?=momentDateJS()?>',
time: false
});
});
$('.file-upload').on('click', function (e) {
e.preventDefault();