diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index e7ce008e..7cc74df8 100755 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -15,21 +15,6 @@ $routes->get('/', 'Home::index'); $routes->get('lang/{locale}', 'Language::index'); $routes->get('viewmode/(:alpha)', 'Viewmode::index/$1'); -//API ROUTER ------------------------------------------------------ -//------------------------------------------------------------------ -$routes->get('api/', 'Api::index'); -$routes->get('api/status', 'Api::status'); -$routes->post('api/signIn', 'Api::signIn'); - -//API ROUTER USER ------------------------------------------------------ -//------------------------------------------------------------------ -$routes->get('api/user/', 'Api::user/all'); -$routes->get('api/user/(:segment)', 'Api::user/id/$1'); -$routes->post('api/user/', 'Api::user/add'); -$routes->put('api/user/(:segment)', 'Api::user/edit/$1'); -$routes->delete('api/user/(:segment)', 'Api::user/delete/$1'); - - /* * -------------------------------------------------------------------- * Route Definitions diff --git a/ci4/app/Config/Safekat.php b/ci4/app/Config/Safekat.php index 9f693a44..2a534c0a 100644 --- a/ci4/app/Config/Safekat.php +++ b/ci4/app/Config/Safekat.php @@ -1,27 +1,27 @@ 'English', 'es' => 'Spanish', ]; - public $languageFlags = [ + public array $languageFlags = [ 'en' => 'us', 'es' => 'es', ]; diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php deleted file mode 100755 index 3e91a47c..00000000 --- a/ci4/app/Filters/LoginAuthFilter.php +++ /dev/null @@ -1,203 +0,0 @@ -validateIgnoreControllerAccess()){ - $session = session(); - $token = $session->get('token')??''; - $tfa = $session->get('tfa')??false; - - $this->getSettings(); - - if (empty($token) || $tfa == true) { - return redirect()->to('/login'); - }else{ - $this->validateControllerAccess(); - } - }*/ - } catch (Exception $e) { - - } - } - - public function after(RequestInterface $request, ResponseInterface $response, $arguments = null) - { - - } - - /** - * Access to controllers is valid. - */ - public function validateControllerAccess(){ - $request = \Config\Services::request(); - $uri = $request->getUri(); - - $language = \Config\Services::language(); - $language->setLocale(session()->lang); - - $getWhiteList = $this->whiteListController(); - - foreach ($getWhiteList as $item){ - if(strtolower($item) == $uri->getSegment(1)){ - return true; - } - } - - $getRules = json_decode(session()->get('rules')??'[]'); - - foreach ($this->whiteListMethod() as $item){ - if(strtolower($item) == $uri->getSegment(2)){ - return true; - } - } - - foreach ($getRules as $key=>$value){ - if(strtolower($key) == $uri->getSegment(1)){ - if($uri->getTotalSegments() <= 1){ - return true; - } - foreach ($value as $item){ - if(strtolower($item) == $uri->getSegment(2)){ - return true; - } - } - } - else{ - foreach($this->controllerFolderWhiteList() as $folder){ - if(strtolower($folder) == $uri->getSegment(1)){ - if(strtolower($key) == $uri->getSegment(2)){ - if($uri->getTotalSegments() <= 2){ - return true; - } - - foreach ($value as $item){ - if(strtolower($item) == $uri->getSegment(3)){ - return true; - } - } - - } - } - } - - } - } - session()->setFlashdata('sweet', ['error',lang("App.dashboard_alert_rules")]); - header('Location: /home'); - exit(); - } - - /** - * JJO - * Returns the controller folder list - */ - public function controllerFolderWhiteList(){ - return [ - 'Catalogo', - 'Clientes', - 'Compras', - 'Configuracion', - 'EnviosLogistica', - 'Facturacion', - 'Informes', - 'Importacion', - 'Pedidos', - 'Presupuestos', - 'Produccion', - 'Proveedores', - 'Servicios', - 'Tarifas', - ]; - } - - - - /** - * Returns the white list of allowed controllers. - */ - public function whiteListController(){ - return [ - 'Js_loader', - 'BaseController', - 'Home', - 'Login', - 'Oauth', - 'Language', - 'Api', - 'Cron', - 'lang', - 'Ajax', - 'Integration', - 'Migrate', - 'Test', - 'Viewmode', - 'GoBaseController', - 'GoBaseResourceController', - 'Maquinaspapelesimpresion', - 'Maquinastarifasimpresion', - 'Maquinascalles', - 'My', 'Usuarios', 'Notification' // PARA LA DEMO - - ]; - } - - /** - * Returns the whitelist of public controllers. - */ - public function ignoreListController(){ - return [ - ]; - } - - public function validateIgnoreControllerAccess(){ - $request = \Config\Services::request(); - $uri = $request->getUri(); - - $getList = $this->ignoreListController(); - foreach ($getList as $item){ - if(strtolower($item) == $uri->getSegment(1)){ - return true; - } - } - return false; - } - - public function whiteListMethod(){ - return [ - 'initController', - '__construct', - 'validateControllerAccess', - 'whiteListController', - 'whiteListMethod', - 'allItemsSelect', - 'menuItems', - 'datatable', - 'datatable_editor', - 'datatable_2', - 'datatable_editor_2', - 'collect', - 'cast', - ]; - } - - public function getSettings(){ - // Get Settings - $session = session(); - $settingsBase = new SettingsModel(); - $settings = $settingsBase->first()??[]; - $session->set('settings', $settings); - if(empty($session->get('lang'))) { - $session->set('lang', $settings['default_language'] ?? 'es'); - } - } -} \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php index 65947479..a5534604 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php @@ -4,7 +4,7 @@ $token = $session->get('token') ?? ''; $tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); -$picture = session()->get('picture'); +$picture = "/assets/img/default-user.png"; $pulse = session()->get('pulse'); $notification = session()->get('notification'); @@ -31,7 +31,7 @@ if (!empty($token) && $tfa == false) { content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + <?= config('Safekat')->appName ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index b15d5276..fd8f2ef2 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -1,16 +1,7 @@ get('token') ?? ''; -$tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); - -$picture = session()->get('picture'); -$pulse = session()->get('pulse'); -$notification = session()->get('notification'); - -if (!empty($token) && $tfa == false) { - //echo ""; -} +$picture = "/assets/img/default-user.png"; ?> @@ -31,7 +22,7 @@ if (!empty($token) && $tfa == false) { content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + <?= config('Safekat')->appName ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index 30c4154e..5f8ecdd7 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -1,16 +1,7 @@ get('token') ?? ''; -$tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); - -$picture = session()->get('picture'); -$pulse = session()->get('pulse'); -$notification = session()->get('notification'); - -if (!empty($token) && $tfa == false) { - //echo ""; -} +$picture = "/assets/img/default-user.png"; ?> @@ -31,7 +22,7 @@ if (!empty($token) && $tfa == false) { content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + <?= config('Safekat')->appName ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php index b7dc615e..e69defe8 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/demo_view.php +++ b/ci4/app/Views/themes/backend/vuexy/main/demo_view.php @@ -4,7 +4,7 @@ $token = $session->get('token') ?? ''; $tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); -$picture = session()->get('picture'); +$picture = "/assets/img/default-user.png"; $pulse = session()->get('pulse'); $notification = session()->get('notification'); @@ -30,7 +30,7 @@ if (!empty($token) && $tfa == false) { content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + <?= config('Safekat')->appName ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php index 7b5e21b8..b1b9aa2b 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/general_settings_layout.php @@ -4,7 +4,7 @@ $token = $session->get('token') ?? ''; $tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); -$picture = session()->get('picture'); +$picture = "/assets/img/default-user.png"; $pulse = session()->get('pulse'); $notification = session()->get('notification'); @@ -31,7 +31,7 @@ if (!empty($token) && $tfa == false) { content="width=device-width, initial-scale=1.0, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0" /> - <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + <?= config('Safekat')->appName ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/header.php b/ci4/app/Views/themes/backend/vuexy/main/header.php index 118d727a..98bfe3f3 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/header.php +++ b/ci4/app/Views/themes/backend/vuexy/main/header.php @@ -5,7 +5,7 @@ $tfa = $session->get('tfa') ?? false; $settings = $session->get('settings'); // Legacy TODO: check? -$picture = session()->get('picture'); +$picture = "/assets/img/default-user.png"; $pulse = session()->get('pulse'); $notification = session()->get('notification'); diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php index cad82397..778587c9 100755 --- a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php @@ -1,11 +1,9 @@ - -