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

Recuperando cambios peridos en el merge?

Browse Source
This commit is contained in:
imnavajas
2023-05-16 14:13:42 +02:00
parent 224ea78c3c
commit dd9686d966
9 changed files with 66 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Config/Basics.php
View File

@ -28,7 +28,7 @@ class Basics extends BaseConfig {
public $appName = 'Safekat';
public $i18n = 'Spanish';
public $i18n = 'es-ES';
public $languages = [
'en' => 'English',

10
ci4/app/Controllers/Integration.php
View File

@ -131,23 +131,23 @@ class Integration extends BaseController
foreach (keywordEmail()??[] as $item){
$field = str_replace(['[','user_',']'],'',$item);
$template = str_replace('['.$item.']',$user[$field],$template);
$template = str_replace('['.$item.']',$user->$field ?? "",$template);
}
$token = random_string("alnum", 50);
$url = base_url().'/login/recovery/'.$token;
$url = base_url().'login/recovery/'.$token;
$this->pass_recovery_model->save([
'user' => $user['token'],
'user' => $user->token,
'token' => $token
]);
$title = $template['subject']??'';
$msg = $template['body']??'';
$msg = str_replace('[recovery_password]',$url,$msg);
$email = $user['email'];
$email = $user->email;
$this->setLog('recovery','recovery-password',$user['token']);
$this->setLog('recovery','recovery-password',$user->token);
$send = $this->sendMail($title,$msg,$email);
if($send){
$session->setFlashdata('toast', ['success',lang("App.login_alert_send"),lang("App.login_alert_send_pass")]);

28
ci4/app/Controllers/Pedidos/Pedido.php
View File

@ -16,20 +16,20 @@ class Pedido extends BaseController
echo 'Pedido';
}
public function delete_files()
{
}
public function pedidos_maquetacion()
{
}
public function pedidos_prestashop()
{
}
// public function delete_files()
// {
//
// }
//
// public function pedidos_maquetacion()
// {
//
// }
//
// public function pedidos_prestashop()
// {
//
// }
}

3
ci4/app/Filters/LoginAuthFilter.php
View File

@ -140,7 +140,8 @@ class LoginAuthFilter implements FilterInterface
'Migrate',
'Test',
'GoBaseController',
'GoBaseResourceController'
'GoBaseResourceController',
'Settings', 'My', 'Activity', 'Notification' // PARA LA DEMO
];
}

2
ci4/app/Views/themes/_commonPartialsBs/datatables.php
View File

@ -160,7 +160,7 @@
"scrollX": true,
"stateSave": true,
"language": {
//url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json"
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
},
"columnDefs": [
{

9
ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php
View File

@ -78,7 +78,6 @@
<!-- </td>-->
<!-- </tr>-->
<?php foreach (getAllFolder() as $folder): ?>
<?php foreach (getAllClass() as $item): ?>
<?php if (str_contains($item['path'], $folder)): ?>
<tr>
@ -90,7 +89,9 @@
<input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input">
class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label>
</div>
@ -113,7 +114,9 @@
<input type="checkbox"
id="<?= $item['name'] . '_' . $subitem ?>"
name="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-input">
class="form-check-input"
<?=ruleIsChecked($group->rules, $item['name'], $subitem)?'checked':''?>
>
<label for="<?= $item['name'] . '_' . $subitem ?>"
class="form-check-label"><?= getDictionary($subitem) ?></label>
</div>