From bf40cd862fbc35617dd70f234b4d76a88d166ee6 Mon Sep 17 00:00:00 2001 From: darock Date: Tue, 21 Jan 2020 19:03:11 +0200 Subject: [PATCH 01/10] YML required index added --- resources/lang/en/modules.php | 1 + resources/lang/ro/modules.php | 1 + .../views/admin/core/modules/partials/changelog.blade.php | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/resources/lang/en/modules.php b/resources/lang/en/modules.php index a8223a4..3bbf99c 100644 --- a/resources/lang/en/modules.php +++ b/resources/lang/en/modules.php @@ -16,4 +16,5 @@ 'added' => 'Added', 'changed' => 'Changed', 'removed' => 'Removed', + 'required' => 'Action required', ]; diff --git a/resources/lang/ro/modules.php b/resources/lang/ro/modules.php index 8b4a346..3943240 100644 --- a/resources/lang/ro/modules.php +++ b/resources/lang/ro/modules.php @@ -16,4 +16,5 @@ 'added' => 'Adaugari', 'changed' => 'Modificari', 'removed' => 'Stergeri', + 'required' => 'Necesita actiuni', ]; diff --git a/resources/views/admin/core/modules/partials/changelog.blade.php b/resources/views/admin/core/modules/partials/changelog.blade.php index ee70783..3ee99cc 100644 --- a/resources/views/admin/core/modules/partials/changelog.blade.php +++ b/resources/views/admin/core/modules/partials/changelog.blade.php @@ -34,6 +34,14 @@ 'data' => $info['removed'] ]) + + @include('admin.core.modules.partials.changelog-part', [ + 'title' => trans('modules.required'), + 'label' => 'info', + 'color' => 'orange', + 'data' => $info['required'] + ]) + From 085c9e3dd26a53679837e2ef8e082cef4532518a Mon Sep 17 00:00:00 2001 From: darock Date: Wed, 22 Jan 2020 19:00:32 +0200 Subject: [PATCH 02/10] Disable mod for catalog --- opencart-module/2.x/opencore.ocmod.zip | Bin 11351 -> 11464 bytes .../catalog/controller/startup/opencore.php | 8 +++ opencart-module/3.x/opencore.ocmod.zip | Bin 11279 -> 11357 bytes .../catalog/controller/startup/opencore.php | 8 +++ support/Opencart/OcCore.php | 53 +++--------------- support/Resources/opencore.ocmod.xml | 7 ++- 6 files changed, 27 insertions(+), 49 deletions(-) diff --git a/opencart-module/2.x/opencore.ocmod.zip b/opencart-module/2.x/opencore.ocmod.zip index f2463e86972120be67094bb007f479528d9106df..37ede5ee860435e9172733f1e767c8add496e574 100644 GIT binary patch delta 6303 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 diff --git a/opencart-module/2.x/upload/catalog/controller/startup/opencore.php b/opencart-module/2.x/upload/catalog/controller/startup/opencore.php index 6f82042..88d8600 100644 --- a/opencart-module/2.x/upload/catalog/controller/startup/opencore.php +++ b/opencart-module/2.x/upload/catalog/controller/startup/opencore.php @@ -27,6 +27,14 @@ class ControllerStartupOpencore extends Startup */ function before_controller($route, &$data, &$output = false) { + /** + * In case we want to disable OpenCore for catalog + * OPENCORE_DISABLED constant must be defined in config.php + */ + if(defined('OPENCORE_DISABLED')) { + return null; + } + /* if (self::$booted) { return false; } */ diff --git a/opencart-module/3.x/opencore.ocmod.zip b/opencart-module/3.x/opencore.ocmod.zip index fc0cf6897208e90d49986d486dbb88fce704d1b7..ed70fd3dc0c2d47a901b58259e868fee1058363e 100644 GIT binary patch delta 7103 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 diff --git a/opencart-module/3.x/upload/catalog/controller/startup/opencore.php b/opencart-module/3.x/upload/catalog/controller/startup/opencore.php index 6f82042..88d8600 100644 --- a/opencart-module/3.x/upload/catalog/controller/startup/opencore.php +++ b/opencart-module/3.x/upload/catalog/controller/startup/opencore.php @@ -27,6 +27,14 @@ class ControllerStartupOpencore extends Startup */ function before_controller($route, &$data, &$output = false) { + /** + * In case we want to disable OpenCore for catalog + * OPENCORE_DISABLED constant must be defined in config.php + */ + if(defined('OPENCORE_DISABLED')) { + return null; + } + /* if (self::$booted) { return false; } */ diff --git a/support/Opencart/OcCore.php b/support/Opencart/OcCore.php index 8e68c55..16d6ac5 100644 --- a/support/Opencart/OcCore.php +++ b/support/Opencart/OcCore.php @@ -11,29 +11,12 @@ trait OcCore { - /*public $registry; - - public function setInstance($registry) - { - $this->registry = $registry; - return $this->registry; - } - - public function __get($key) - { - return $this->registry->get($key); - } - - public static function getInstance() + public function removeIndexAndRouteParam($url) { - if ($this->registry === NULL) { - throw new Exception('Oc Registry Instance Could not be loaded'); + if (defined('OPENCORE_DISABLED')) { + return $url; } - return $this->registry; - }*/ - public function removeIndexAndRouteParam($url) - { if (strstr($url, 'index.php?route=')) { $url = str_replace('index.php?route=common/home', '', $url); //replace home url for catalog $url = str_replace('&', '&', $url); @@ -53,6 +36,9 @@ public function routeCatalogSeoUrl() */ if (!$this->config->get('smp_is_install')) { + if (defined('OPENCORE_DISABLED')) { + return true; + } /** * check if not found, maybe the page exists in Laravel system */ @@ -66,7 +52,7 @@ public function routeCatalogSeoUrl() public function isRouted($route) { - return !empty($this->request->has_route[$route]); + return !defined('OPENCORE_DISABLED') && !empty($this->request->has_route[$route]); } public function getTokenStr() @@ -111,29 +97,4 @@ public function removePermissions($path, $permissions = ['access', 'modify']) $this->model_user_user_group->removePermission($this->user->getGroupId(), $permission, $path); } } - - function getWorkingFolder() - { - return !defined('HTTPS_CATALOG') ? 'catalog' : 'admin'; - } - - function getCurrentLanguage($load_fallback) - { - if ($this->getWorkingFolder() == 'admin') { - $lang = $this->config->get('config_admin_language'); - } else { - $lang = isset($this->session->data['language']) ? basename($this->session->data['language']) : $this->config->get('config_language'); - } - - return $load_fallback ? 'en-gb' : ($lang ?: $this->getCurrentLanguage(true)); - } - - public function getOcControllers($controllers = [], $args = []) - { - foreach ($controllers as $key => $controller) { - $this->setData($key, $this->getOcController($controller, $args)); - } - - return $this; - } } diff --git a/support/Resources/opencore.ocmod.xml b/support/Resources/opencore.ocmod.xml index 2d162fd..5dd3225 100644 --- a/support/Resources/opencore.ocmod.xml +++ b/support/Resources/opencore.ocmod.xml @@ -11,7 +11,8 @@ @@ -103,7 +104,7 @@ use OpenCore\Support\OpenCart\OcCore; @@ -118,7 +119,7 @@ use OpenCore\Support\OpenCart\OcCore; - + From 41c668eff9074f9b84ee6f97f2cff288061f3c3f Mon Sep 17 00:00:00 2001 From: darock Date: Wed, 22 Jan 2020 19:01:02 +0200 Subject: [PATCH 03/10] Module management cache bug fix --- app/Http/Controllers/Admin/Core/ModulesController.php | 11 +++++++++++ modules/Example/module.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Core/ModulesController.php b/app/Http/Controllers/Admin/Core/ModulesController.php index a61957f..6a9d285 100644 --- a/app/Http/Controllers/Admin/Core/ModulesController.php +++ b/app/Http/Controllers/Admin/Core/ModulesController.php @@ -1,4 +1,11 @@ removePermission($userGroupId, 'access', $path); $model_user_user_group->removePermission($userGroupId, 'modify', $path); + Artisan::call('cache:clear'); + return redirect()->route('admin::core.modules.show', [$module->getLowerName()]) ->with('success', trans('modules.disabled')); } @@ -106,6 +115,8 @@ public function enable(Module $module) $model_user_user_group->addPermission($userGroupId, 'access', $path); $model_user_user_group->addPermission($userGroupId, 'modify', $path); + Artisan::call('cache:clear'); + return redirect()->route('admin::core.modules.show', [$module->getLowerName()])->with( 'success', trans('modules.enabled') diff --git a/modules/Example/module.json b/modules/Example/module.json index 7d49a5c..c847174 100644 --- a/modules/Example/module.json +++ b/modules/Example/module.json @@ -4,7 +4,7 @@ "description": "Example module", "keywords": [], "version": "1.0.0", - "active": 1, + "active": 0, "order": 1000, "links": { "example::admin.index": "Example Form" From 6d9c299a1909764217a7b4f9250d5a9813addda9 Mon Sep 17 00:00:00 2001 From: darock Date: Wed, 22 Jan 2020 19:01:48 +0200 Subject: [PATCH 04/10] OpenCart Debug mode added --- Framework.php | 52 ++++++++++++++++++++++------ app/Exceptions/Handler.php | 44 +++++++++++++++++++++++ app/Providers/AppServiceProvider.php | 29 ++++++++++++---- composer.json | 8 +++-- config/opencore.php | 16 ++++++++- support/OcLoader.php | 44 +++++++++++++++++++++++ support/Opencart/Startup.php | 35 +++++++++++++------ 7 files changed, 197 insertions(+), 31 deletions(-) create mode 100644 support/OcLoader.php diff --git a/Framework.php b/Framework.php index 70cccb9..cfc48ca 100644 --- a/Framework.php +++ b/Framework.php @@ -9,6 +9,8 @@ namespace OpenCore; +use Exception; + define('LARAVEL_START', microtime(true)); /* @@ -31,17 +33,30 @@ class Framework private $response; private $request = null; private $kernel; - private $get_routes; private $registry; - private $route; - private $output; + public $route; + public $output; + public $routes_session; + + public const NOT_FOUND = 0; + public const FOUND = 1; public function __construct() { $this->app = require __DIR__ . '/bootstrap/app.php'; $this->kernel = $this->app->make(\Illuminate\Contracts\Http\Kernel::class); + + $this->app->singleton('OcLoader', function () { + $OcLoader = new \OpenCore\Support\OcLoader(); + /** + * set loaded true in order to know the request was done through OpenCart + */ + $OcLoader->set('loaded', true); + + return $OcLoader; + }); } /** @@ -61,6 +76,8 @@ public function initiate($registry, $route, &$output) $this->registry = $registry; $this->route = $route; $this->output = $output; + + $this->routes_session[] = $route; } /** @@ -70,7 +87,7 @@ public function getResponse() { $this->response->sendHeaders(); - $content = $this->response->getContent(); + $content = $this->response; $this->kernel->terminate($this->request, $this->response); @@ -128,18 +145,33 @@ public function checkRoute() /** * TODO: find a better way to check all available routes */ - if (!isset($this->get_routes)) { - $response = $this->kernel->handle($request = \Illuminate\Http\Request::capture()); + if (!$this->app->OcLoader->get('routes')) { + $request = \Illuminate\Http\Request::capture(); + + /** + * Force returning an empty response + */ + $this->app->OcLoader->flash('check-routes', true); + + $response = $this->kernel->handle($request); $this->kernel->terminate($request, $response); - $this->get_routes = $this->app->router->getRoutes(); - }; + $this->app->OcLoader->set('routes', $this->app->router->getRoutes()); + + } try { - return (bool) $this->get_routes->match($this->request)->uri(); + $routes = $this->app->OcLoader->get('routes'); + + if ((bool) $routes->match($this->request)->uri()) { + return self::FOUND; + } else { + return self::NOT_FOUND; + } + } catch (\Symfony\Component\HttpKernel\Exception\NotFoundHttpException $e) { - return false; + return self::NOT_FOUND; } } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 043cad6..3ca7e6a 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -4,6 +4,7 @@ use Exception; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Support\Facades\Config; class Handler extends ExceptionHandler { @@ -46,6 +47,49 @@ public function report(Exception $exception) */ public function render($request, Exception $exception) { + if ($exception instanceof \Symfony\Component\HttpKernel\Exception\NotFoundHttpException) { + /** + * Ignore 404 Error in case of route check + */ + + if (app('OcLoader')->get('check-routes')) { + /* disable debug bar */ + $debugBar = (Config::get('app.debug') && \App::environment('local')); + if ($debugBar) { + app('debugbar')->disable(); + } + /* return blank response */ + $response = response(''); + + /* re-enable debug but for next response */ + if ($debugBar) { + app('debugbar')->enable(); + } + return $response; + } + } + + if (app('OcLoader')->get('loaded') && Config::get('app.debug') && Config::get('opencore.debug_opencart')) { + /** + * In case of an error throw by OpenCart we will clear the output and display just the error itself + * Also we will delete the last route_session from cache + */ + + $cache = \OpenCore\Framework::getInstance()->getRegistry('cache'); + + $appBaseName = basename(DIR_APPLICATION); + $allowed_routes = $cache->get('opencore_routes.' . $appBaseName); + + foreach(\OpenCore\Framework::getInstance()->routes_session as $route_session) { + if(isset($allowed_routes[$route_session])) { + unset($allowed_routes[$route_session]); + } + } + $cache->set('opencore_routes.' . $appBaseName, $allowed_routes, time() + 3600); + + ob_clean(); + } + return parent::render($request, $exception); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 4b63967..ad7981b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -18,17 +18,27 @@ class AppServiceProvider extends ServiceProvider */ public function register() { + /** + * Initiate loader in case the request is not done throught OpenCart + * and in order to avoid futher errors throwing + */ + if (!$this->app->bound('OcLoader')) { + $this->app->bind('OcLoader', function () { + return new \OpenCore\Support\OcLoader(); + }); + } + app('router')->bind('module', function ($module) { return app(RepositoryInterface::class)->find($module); }); - $this->app->bind('OcCore', function () { - return new OcCore(); - }); - - /* if ($this->app->environment() === 'local') { - $this->app->register('\Barryvdh\Debugbar\ServiceProvider'); - } */ + /** + * Loading Barryvdh Debug bar + * must be on local and APP_DEBUG = true + */ + if (\App::environment('local')) { + $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class); + } } /** @@ -44,6 +54,7 @@ public function boot() if (class_exists('\OpenCore\Framework')) { $this->app->singleton('db.connector.mysql', '\OpenCore\Support\MySqlSharedConnector'); } + /** * Rewrite admin routes in order to contain the Token query param * corrects assets url @@ -57,6 +68,10 @@ public function boot() */ Schema::defaultStringLength(191); + $this->app->bind('OcCore', function () { + return new OcCore(); + }); + /** * set language based on OpenCart language session * if there is an instance of OpenCart ready diff --git a/composer.json b/composer.json index 582157c..9c1a47f 100644 --- a/composer.json +++ b/composer.json @@ -21,14 +21,15 @@ "laravelcollective/html": "~5.0" }, "require-dev": { + "arcanedev/log-viewer": "^4.7", + "barryvdh/laravel-debugbar": "^3.2", "beyondcode/laravel-dump-server": "^1.0", + "facade/ignition": "^1.0", "filp/whoops": "^2.0", "fzaninotto/faker": "^1.4", "mockery/mockery": "^1.0", "nunomaduro/collision": "^3.0", "phpunit/phpunit": "^7.5", - "facade/ignition": "^1.0", - "arcanedev/log-viewer": "^4.7", "studio/laravel-totem": "^5.3" }, "config": { @@ -45,7 +46,8 @@ "intervention/image", "rachidlaasri/laravel-installer", "arcanedev/log-viewer", - "studio/laravel-totem" + "studio/laravel-totem", + "barryvdh/laravel-debugbar" ] } }, diff --git a/config/opencore.php b/config/opencore.php index e705e62..3387747 100644 --- a/config/opencore.php +++ b/config/opencore.php @@ -1,6 +1,19 @@ env('OPENCORE_DEBUG_OPENCART', false), + /* |-------------------------------------------------------------------------- | These are the core modules that should NOT be disabled under any circumstance @@ -9,10 +22,11 @@ 'coreModules' => [ 'core' ], + /* |-------------------------------------------------------------------------- | Date format |-------------------------------------------------------------------------- */ - 'dateformat' => 'd.m.Y H:i:s', + 'dateformat' => env('OPENCORE_DATEFORMAT', 'd.m.Y H:i:s'), ]; diff --git a/support/OcLoader.php b/support/OcLoader.php new file mode 100644 index 0000000..fe9ff86 --- /dev/null +++ b/support/OcLoader.php @@ -0,0 +1,44 @@ +flash[$name] = true; + + $this->set($name, $val); + } + + function set($name, $val = true) + { + $this->unsetFlash($name); + + $this->loaded[$name] = $val; + } + + function get($name) + { + $this->unsetFlash($name); + + return $this->loaded[$name] ?? null; + } + + private function unsetFlash($name) + { + if (isset($this->flash[$name])) { + unset($this->flash[$name]); + } + } +} diff --git a/support/Opencart/Startup.php b/support/Opencart/Startup.php index 8b37436..35e732c 100644 --- a/support/Opencart/Startup.php +++ b/support/Opencart/Startup.php @@ -17,7 +17,6 @@ define('OPENCORE_VERSION', '1.2.1'); } -require_once __DIR__ . '/../../vendor/autoload.php'; require_once __DIR__ . '/../../Framework.php'; use Opencore\Framework; @@ -28,7 +27,7 @@ class Startup extends \Controller private $route; private $data; - private $routes_cache_time = 3600; //1 hour expiration time + public $routes_cache_time = 3600; //1 hour expiration time private $default_allowed_routes = [ 'admin/core/home', @@ -70,7 +69,15 @@ public function executeIfRouteExists($route, &$data, &$output = false) $this->route = rawurldecode($this->route); if ($this->checkOpenCoreRoute()) { - $response = $this->response(); + $response = $this->response()->getContent(); + + /** + * set content type of the response received + */ + $contentType = $this->response()->headers->all('content-type'); + if (!empty($contentType[0])) { + $this->response->addHeader('Content-Type: ' . $contentType[0]); + } if ($output === false) { /** @@ -117,8 +124,9 @@ public function checkOpenCoreRoute() $allowed_routes = $cache->get('opencore_routes.' . $appBaseName); //separate for admin & catalog to avoid large cache files } + $force = false; if (in_array($this->route, $this->default_allowed_routes)) { - $allowed_routes[$this->route] = true; + $force = true; } if (isset($allowed_routes[$this->route]) && $allowed_routes[$this->route] == false) { @@ -126,23 +134,30 @@ public function checkOpenCoreRoute() } else { Framework::getInstance()->initiate(self::$_registry, $this->route, $output); - if (!empty($allowed_routes[$this->route])) { + if (!empty($allowed_routes[$this->route]) || $force) { Framework::getInstance()->initiateRouteRequest(); - } elseif (Framework::getInstance()->checkRoute()) { - $allowed_routes[$this->route] = true; } else { - $allowed_routes[$this->route] = false; + $checkRoute = Framework::getInstance()->checkRoute(); + + switch ($checkRoute) { + case Framework::FOUND: + $allowed_routes[$this->route] = true; + break; + case Framework::NOT_FOUND: + $allowed_routes[$this->route] = false; + break; + } } } /** * Cache OpenCore allowed routes for faster rendering */ - if ($this->routes_cache_time) { + if ($this->routes_cache_time && !$force) { $cache->set('opencore_routes.' . $appBaseName, $allowed_routes, time() + $this->routes_cache_time); } - if ($allowed_routes[$this->route]) { + if (!empty($allowed_routes[$this->route]) || $force) { return Framework::getInstance()->handle(); } From c93c67b7311284cbc703c51a79c82fab709a3a2d Mon Sep 17 00:00:00 2001 From: darock Date: Thu, 23 Jan 2020 14:19:09 +0200 Subject: [PATCH 05/10] New entities added --- support/Entities/Cart.php | 21 +++++++++++++++++++++ support/Entities/Language.php | 13 +++++++++++++ support/Entities/Order.php | 10 ++++++++++ support/Entities/Product.php | 21 +++++++++++++++++++++ 4 files changed, 65 insertions(+) create mode 100644 support/Entities/Cart.php create mode 100644 support/Entities/Language.php create mode 100644 support/Entities/Product.php diff --git a/support/Entities/Cart.php b/support/Entities/Cart.php new file mode 100644 index 0000000..1419052 --- /dev/null +++ b/support/Entities/Cart.php @@ -0,0 +1,21 @@ +firstname} {$this->lastname}")); + } } diff --git a/support/Entities/Product.php b/support/Entities/Product.php new file mode 100644 index 0000000..35c96f6 --- /dev/null +++ b/support/Entities/Product.php @@ -0,0 +1,21 @@ + Date: Thu, 23 Jan 2020 14:19:34 +0200 Subject: [PATCH 06/10] SettingRepository update --- support/Repositories/SettingRepository.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/support/Repositories/SettingRepository.php b/support/Repositories/SettingRepository.php index e6a142c..d23cdb0 100644 --- a/support/Repositories/SettingRepository.php +++ b/support/Repositories/SettingRepository.php @@ -6,10 +6,21 @@ class SettingRepository { + private $settings; + + public function __construct() + { + $settings = Setting::select(['key', 'value', 'serialized'])->get(); + foreach ($settings as $setting) { + if ($setting->serialized) { + $this->settings[$setting->key] = json_decode($setting->value); + } else { + $this->settings[$setting->key] = $setting->value; + } + } + } public function get($key) { - $setting = Setting::select(['value', 'serialized'])->where('key', $key)->first(); - - return $setting->serialized ? json_decode($setting->value) : $setting->value; + return $this->settings[$key] ?? null; } } From c4e4ddc09b67cdb69b05c8117ff1be46005ef657 Mon Sep 17 00:00:00 2001 From: DaRock Date: Thu, 23 Jan 2020 20:31:09 +0200 Subject: [PATCH 07/10] opencore:register-routes - artisan command added --- .../Commands/RegisterRoutesCommand.php | 113 ++++++++++++++++++ app/Console/Kernel.php | 3 +- ...20_01_23_190536_create_opencore_routes.php | 37 ++++++ support/Entities/OpencoreRoute.php | 22 ++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 app/Console/Commands/RegisterRoutesCommand.php create mode 100644 database/migrations/2020_01_23_190536_create_opencore_routes.php create mode 100644 support/Entities/OpencoreRoute.php diff --git a/app/Console/Commands/RegisterRoutesCommand.php b/app/Console/Commands/RegisterRoutesCommand.php new file mode 100644 index 0000000..44c2c74 --- /dev/null +++ b/app/Console/Commands/RegisterRoutesCommand.php @@ -0,0 +1,113 @@ +router = $router; + } + + /** + * Execute the console command. + * + * @return void + */ + public function handle() + { + if (empty($this->router->getRoutes())) { + $this->deleteAllRoutes(); + + return $this->error("Your application doesn't have any routes."); + } + + $this->registerRoutes(); + + return $this->info("Your route have been registered."); + } + + /** + * Register all routes into database + * + * @return void + */ + protected function registerRoutes() + { + $registeredRoutes = OpencoreRoute::get()->pluck('id', 'unique_key')->toArray(); + + $keep = []; + $routes = $this->router->getRoutes(); + foreach ($routes as $route) { + foreach ($route->methods() as $method) { + if (!in_array($method, $this->ignore_methods)) { + $data = [ + 'method' => $method, + 'uri' => $route->uri(), + 'name' => $route->getName() + ]; + + $key = implode('', $data); + + $id = $registeredRoutes[$key] ?? null; + if (is_null($id)) { + $id = OpencoreRoute::insertGetId($data); + } + $keep[] = $id; + } + } + } + + OpencoreRoute::whereNotIn('id', $keep)->delete(); + } + + /** + * Delete all routes from database + * + * @return void + */ + protected function deleteAllRoutes() + { + OpencoreRoute::truncate(); + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index a8c5158..509eb8a 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -4,6 +4,7 @@ use Illuminate\Console\Scheduling\Schedule; use Illuminate\Foundation\Console\Kernel as ConsoleKernel; +use App\Console\Commands\RegisterRoutesCommand; class Kernel extends ConsoleKernel { @@ -13,7 +14,7 @@ class Kernel extends ConsoleKernel * @var array */ protected $commands = [ - // + RegisterRoutesCommand::class ]; /** diff --git a/database/migrations/2020_01_23_190536_create_opencore_routes.php b/database/migrations/2020_01_23_190536_create_opencore_routes.php new file mode 100644 index 0000000..85ca24a --- /dev/null +++ b/database/migrations/2020_01_23_190536_create_opencore_routes.php @@ -0,0 +1,37 @@ +bigIncrements('id'); + $table->string('method', 10); + $table->string('uri', 191); + $table->string('name', 100)->nullable(); + $table->tinyInteger('status')->default(1); + $table->timestamps(); + + $table->unique(['method', 'uri', 'name'], 'method_uri_name'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('opencore_routes'); + } +} diff --git a/support/Entities/OpencoreRoute.php b/support/Entities/OpencoreRoute.php new file mode 100644 index 0000000..6da4d94 --- /dev/null +++ b/support/Entities/OpencoreRoute.php @@ -0,0 +1,22 @@ +method . $this->uri . $this->name; + } +} From de35fda90d2ccc1f31d2c75b635f0f778e4d061b Mon Sep 17 00:00:00 2001 From: DaRock Date: Fri, 24 Jan 2020 12:36:29 +0200 Subject: [PATCH 08/10] Routes management section added --- README.md | 1 + .../Commands/RegisterRoutesCommand.php | 6 ++ .../Admin/Core/ModulesController.php | 4 +- .../{ => System}/ClearCacheController.php | 7 +- .../Core/System/RegisterRoutesController.php | 54 +++++++++++++ .../{ => System}/RequirementsController.php | 4 +- config/opencore.php | 11 +++ resources/lang/en/general.php | 10 ++- resources/lang/en/modules.php | 4 - resources/lang/en/system.php | 18 +++++ resources/lang/ro/general.php | 10 ++- resources/lang/ro/modules.php | 4 - resources/lang/ro/system.php | 18 +++++ .../views/admin/core/modules/index.blade.php | 2 +- .../views/admin/core/modules/show.blade.php | 4 +- .../core/{ => system}/requirements.blade.php | 0 .../views/admin/core/system/routes.blade.php | 76 +++++++++++++++++++ resources/views/admin/layouts/app.blade.php | 19 +++-- routes/admin.php | 13 +++- support/Opencart/Startup.php | 8 +- 20 files changed, 235 insertions(+), 38 deletions(-) rename app/Http/Controllers/Admin/Core/{ => System}/ClearCacheController.php (71%) create mode 100644 app/Http/Controllers/Admin/Core/System/RegisterRoutesController.php rename app/Http/Controllers/Admin/Core/{ => System}/RequirementsController.php (88%) create mode 100644 resources/lang/en/system.php create mode 100644 resources/lang/ro/system.php rename resources/views/admin/core/{ => system}/requirements.blade.php (100%) create mode 100644 resources/views/admin/core/system/routes.blade.php diff --git a/README.md b/README.md index 6e9142d..8386269 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,7 @@ MIT license. Please see the [license file](LICENSE) for more information. ## TODO +* force paginator->appends to automatically add token/user_token param for admin requests only * when enabling a module the permission must be added automatically for the user who made the action * Example & Developer modules should be disabled by default * display jobs & failed_jobs lists in developer module diff --git a/app/Console/Commands/RegisterRoutesCommand.php b/app/Console/Commands/RegisterRoutesCommand.php index 44c2c74..81ecb91 100644 --- a/app/Console/Commands/RegisterRoutesCommand.php +++ b/app/Console/Commands/RegisterRoutesCommand.php @@ -1,4 +1,10 @@ route('admin::core.modules.show', [$module->getLowerName()]) - ->with('success', trans('modules.disabled')); + ->with('success', trans('general.status.disabled')); } /** @@ -119,7 +119,7 @@ public function enable(Module $module) return redirect()->route('admin::core.modules.show', [$module->getLowerName()])->with( 'success', - trans('modules.enabled') + trans('general.status.enabled') ); } diff --git a/app/Http/Controllers/Admin/Core/ClearCacheController.php b/app/Http/Controllers/Admin/Core/System/ClearCacheController.php similarity index 71% rename from app/Http/Controllers/Admin/Core/ClearCacheController.php rename to app/Http/Controllers/Admin/Core/System/ClearCacheController.php index 1e7fd26..440f62e 100644 --- a/app/Http/Controllers/Admin/Core/ClearCacheController.php +++ b/app/Http/Controllers/Admin/Core/System/ClearCacheController.php @@ -7,7 +7,7 @@ * */ -namespace App\Http\Controllers\Admin\Core; +namespace App\Http\Controllers\Admin\Core\System; use App\Http\Controllers\Controller; use Illuminate\Support\Facades\Artisan; @@ -21,8 +21,7 @@ function index() Artisan::call('config:clear'); Artisan::call('view:clear'); - return redirect() - ->route('admin::core.home') - ->with('success', trans('general.cache.cleared')); + return redirect(url()->previous()) + ->with('success', trans('system.cache.cleared')); } } diff --git a/app/Http/Controllers/Admin/Core/System/RegisterRoutesController.php b/app/Http/Controllers/Admin/Core/System/RegisterRoutesController.php new file mode 100644 index 0000000..afba8cc --- /dev/null +++ b/app/Http/Controllers/Admin/Core/System/RegisterRoutesController.php @@ -0,0 +1,54 @@ +orderBy('method') + ->paginate(config('opencore.paginate.admin')) + ->appends(request()->except('route')); + + return view('admin.core.system.routes', compact('routes')); + } + + function enable(int $id) + { + $route = OpencoreRoute::findOrFail($id); + $route->status = 1; + $route->save(); + + return redirect(url()->previous()) + ->with('success', trans('system.routes.enabled')); + } + + function disable(int $id) + { + $route = OpencoreRoute::findOrFail($id); + $route->status = 0; + $route->save(); + + return redirect(url()->previous()) + ->with('success', trans('system.routes.disabled')); + } + + function register() + { + Artisan::call('opencore:register-routes'); + + return redirect(url()->previous()) + ->with('success', trans('system.routes.registered')); + } +} diff --git a/app/Http/Controllers/Admin/Core/RequirementsController.php b/app/Http/Controllers/Admin/Core/System/RequirementsController.php similarity index 88% rename from app/Http/Controllers/Admin/Core/RequirementsController.php rename to app/Http/Controllers/Admin/Core/System/RequirementsController.php index b822cc0..9fae5c7 100644 --- a/app/Http/Controllers/Admin/Core/RequirementsController.php +++ b/app/Http/Controllers/Admin/Core/System/RequirementsController.php @@ -7,7 +7,7 @@ * */ -namespace App\Http\Controllers\Admin\Core; +namespace App\Http\Controllers\Admin\Core\System; use App\Http\Controllers\Controller; use RachidLaasri\LaravelInstaller\Helpers\RequirementsChecker; @@ -54,6 +54,6 @@ public function index() $cronpath = realpath(basename(__DIR__ . '/../')) . '/core/artisan'; - return view('admin.core.requirements', compact('requirements', 'phpSupportInfo', 'permissions', 'cronpath')); + return view('admin.core.system.requirements', compact('requirements', 'phpSupportInfo', 'permissions', 'cronpath')); } } diff --git a/config/opencore.php b/config/opencore.php index 3387747..1660dd4 100644 --- a/config/opencore.php +++ b/config/opencore.php @@ -29,4 +29,15 @@ |-------------------------------------------------------------------------- */ 'dateformat' => env('OPENCORE_DATEFORMAT', 'd.m.Y H:i:s'), + + /* + |-------------------------------------------------------------------------- + | Pagination + |-------------------------------------------------------------------------- + */ + + 'paginate' => [ + 'admin' => 25, + 'catalog' => 20 + ] ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 1626573..5162d92 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -3,10 +3,11 @@ return [ 'menu' => [ 'toggle' => 'Menu', - 'requirements' => 'System Requirements', 'modules' => 'Modules', 'modules_management' => 'Modules Management', 'system' => 'System', + 'routes' => 'Routes', + 'requirements' => 'System Requirements', 'clear_cache' => 'Clear Cache', ], 'home' => [ @@ -16,8 +17,11 @@ 'cron' => [ 'info' => 'Don\'t forget to add the folowing cronjob on your hosting control panel (cPanel)' ], - 'cache' => [ - 'cleared' => 'Cache cleared!' + 'status' => [ + 'enable' => 'Enable', + 'disable' => 'Disable', + 'enabled' => 'Enabled', + 'disabled' => 'Disabled', ], 'powered_by' => 'Powered by', 'error_title' => 'Whoops! Something went wrong!', diff --git a/resources/lang/en/modules.php b/resources/lang/en/modules.php index 3bbf99c..9aa0de8 100644 --- a/resources/lang/en/modules.php +++ b/resources/lang/en/modules.php @@ -5,11 +5,7 @@ 'details' => 'Module Details', 'name' => 'Name', 'version' => 'Version', - 'enabled' => 'Enabled', - 'disabled' => 'Disabled', 'disabled_error' => 'Module cannot be disabled', - 'enable' => 'Enable', - 'disable' => 'Disable', 'publish_assets' => 'Publish Assets', 'update' => 'Update', 'changelog' => 'Changelog', diff --git a/resources/lang/en/system.php b/resources/lang/en/system.php new file mode 100644 index 0000000..b3ac125 --- /dev/null +++ b/resources/lang/en/system.php @@ -0,0 +1,18 @@ + [ + 'title' => 'Routes List', + 'method' => 'Method', + 'uri' => 'Uri', + 'name' => 'Name', + 'action' => 'Action', + 'enabled' => 'Route has been enabled', + 'disabled' => 'Route has been disabled', + 'register' => 'Register Routes', + 'registered' => 'The routes have been registered!' + ], + 'cache' => [ + 'cleared' => 'Cache cleared!' + ], +]; diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php index 0e64f24..dedb8a9 100644 --- a/resources/lang/ro/general.php +++ b/resources/lang/ro/general.php @@ -3,10 +3,11 @@ return [ 'menu' => [ 'toggle' => 'Meniu', - 'requirements' => 'Cerinte sistem', 'modules' => 'Module', 'modules_management' => 'Management Module', 'system' => 'Sistem', + 'routes' => 'Rute', + 'requirements' => 'Cerinte sistem', 'clear_cache' => 'Sterge Cache', ], 'home' => [ @@ -16,8 +17,11 @@ 'cron' => [ 'info' => 'Nu uitati sa adaugati urmatoarea comanda pentru cronjob in panoul de control al serverului de hosting (cPanel)' ], - 'cache' => [ - 'cleared' => 'Cache-ul a fost sters!' + 'status' => [ + 'enable' => 'Activeaza', + 'disable' => 'Dezactiveaza', + 'enabled' => 'Activat', + 'disabled' => 'Dezactivat', ], 'powered_by' => 'Powered by', 'error_title' => 'Opa! Am intampinat probleme!', diff --git a/resources/lang/ro/modules.php b/resources/lang/ro/modules.php index 3943240..1084dbf 100644 --- a/resources/lang/ro/modules.php +++ b/resources/lang/ro/modules.php @@ -5,11 +5,7 @@ 'details' => 'Detalii Modul', 'name' => 'Denumire', 'version' => 'Versiune', - 'enabled' => 'Activat', - 'disabled' => 'Dezactivat', 'disabled_error' => 'Modulul nu poate fi dezactivat', - 'enable' => 'Activati', - 'disable' => 'Dezactivati', 'publish_assets' => 'Publica Asset-uri', 'update' => 'Update', 'changelog' => 'Changelog', diff --git a/resources/lang/ro/system.php b/resources/lang/ro/system.php new file mode 100644 index 0000000..3a90493 --- /dev/null +++ b/resources/lang/ro/system.php @@ -0,0 +1,18 @@ + [ + 'title' => 'Lista Rute', + 'method' => 'Metoda', + 'uri' => 'Uri', + 'name' => 'Denumire', + 'action' => 'Actiune', + 'enabled' => 'Ruta a fost activata', + 'disabled' => 'Ruta a fost dezactivata', + 'register' => 'Inregistreaza Rute', + 'registered' => 'Rutele au fost inregistrate!' + ], + 'cache' => [ + 'cleared' => 'Cache-ul a fost sters!' + ] +]; diff --git a/resources/views/admin/core/modules/index.blade.php b/resources/views/admin/core/modules/index.blade.php index 33f462c..6842b35 100644 --- a/resources/views/admin/core/modules/index.blade.php +++ b/resources/views/admin/core/modules/index.blade.php @@ -46,7 +46,7 @@ - {{ $module->enabled() ? trans('modules.enabled') : trans('modules.disabled') }} + {{ $module->enabled() ? trans('general.status.enabled') : trans('general.status.disabled') }} diff --git a/resources/views/admin/core/modules/show.blade.php b/resources/views/admin/core/modules/show.blade.php index c89845e..f1b65c5 100644 --- a/resources/views/admin/core/modules/show.blade.php +++ b/resources/views/admin/core/modules/show.blade.php @@ -42,9 +42,9 @@ enabled() ? 'alert-danger' : 'alert-success' ?> {!! Form::open(['route' => ["admin::core.modules.$status", $module->getName()], 'method' => 'post']) !!} {!! Form::close() !!} diff --git a/resources/views/admin/core/requirements.blade.php b/resources/views/admin/core/system/requirements.blade.php similarity index 100% rename from resources/views/admin/core/requirements.blade.php rename to resources/views/admin/core/system/requirements.blade.php diff --git a/resources/views/admin/core/system/routes.blade.php b/resources/views/admin/core/system/routes.blade.php new file mode 100644 index 0000000..ba753c2 --- /dev/null +++ b/resources/views/admin/core/system/routes.blade.php @@ -0,0 +1,76 @@ +@extends('admin.layouts.app') + +@section('meta.title') + {{ trans('system.routes.title') }} +@endsection + +@section('container') +

{{ trans('system.routes.title') }}

+
+ {{ trans('system.routes.register') }} +
+
+
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ trans('system.routes.method') }}{{ trans('routes.uri') }}{{ trans('system.routes.name') }}{{ trans('system.routes.action') }}
{{ $route->method }}{{ $route->uri }}{{ $route->name ?? '-' }} + status ? 'disable' : 'enable'; ?> + status ? 'alert-danger' : 'alert-success' ?> + {!! Form::open(['route' => ["admin::core.system.routes.{$status}", $route->id], 'method' => 'post']) !!} + + {!! Form::close() !!} +
{{ trans('system.routes.method') }}{{ trans('system.routes.uri') }}{{ trans('system.routes.name') }}{{ trans('system.routes.action') }}
+ +
+ +
+ {{ $routes->links() }} +
+
+
+
+@stop + +@section('inline.scripts') + +@endsection diff --git a/resources/views/admin/layouts/app.blade.php b/resources/views/admin/layouts/app.blade.php index 9d48ef6..86aa6e5 100644 --- a/resources/views/admin/layouts/app.blade.php +++ b/resources/views/admin/layouts/app.blade.php @@ -27,11 +27,6 @@ @endsection diff --git a/support/Opencart/Startup.php b/support/Opencart/Startup.php index 9dd6597..a0bd402 100644 --- a/support/Opencart/Startup.php +++ b/support/Opencart/Startup.php @@ -33,7 +33,7 @@ class Startup extends \Controller 'admin/core/home', 'admin/core/modules', 'admin/core/system/routes', - 'admin/core/system/register-routes', + 'admin/core/system/routes/register', 'admin/core/system/requirements', 'admin/core/system/clear-cache', ]; @@ -70,7 +70,17 @@ public function executeIfRouteExists($route, &$data, &$output = false) } $this->route = rawurldecode($this->route); + /** + * if is an Admin request add path to route + */ + $appBaseName = basename(DIR_APPLICATION); + if (defined('HTTPS_CATALOG') && !strstr($this->route, $appBaseName . '/')) { + $this->route = $appBaseName . '/' . $this->route; + } + if ($this->checkOpenCoreRoute()) { + Framework::getInstance()->handle(self::$_registry, $this->route, $output); + $response = $this->response()->getContent(); /** @@ -86,6 +96,7 @@ public function executeIfRouteExists($route, &$data, &$output = false) * means is a controller request which means we need to use default setOutput() */ $this->response->setOutput($response); + return true; } else { /** @@ -93,6 +104,7 @@ public function executeIfRouteExists($route, &$data, &$output = false) * Check system/engine/loader.php */ $output = $response; + return false; } } @@ -106,61 +118,48 @@ public function executeIfRouteExists($route, &$data, &$output = false) public function checkOpenCoreRoute() { /** - * if is an Admin request add path to route + * Check default allowed routes */ - $appBaseName = basename(DIR_APPLICATION); - if (defined('HTTPS_CATALOG') && !strstr($this->route, $appBaseName . '/')) { - $this->route = $appBaseName . '/' . $this->route; + if (in_array($this->route, $this->default_allowed_routes)) { + return true; } - /* - TODO: We should add a dynamic ignore list here which should be configurable in admin/core/settings - */ /** * force admin route in case the request comes from admin side */ $allowed_routes = []; - if ($this->routes_cache_time) { - $cache = self::$_registry->get('cache'); - $allowed_routes = $cache->get('opencore_routes.' . $appBaseName); //separate for admin & catalog to avoid large cache files - } - - $force = false; - if (in_array($this->route, $this->default_allowed_routes)) { - $force = true; - } + if (!$allowed_routes = $this->cache->get('opencore_routes')) { + $query = $this->db->query("SELECT method, uri FROM `opencore_routes` WHERE `status` = '1' ORDER BY uri"); - if (isset($allowed_routes[$this->route]) && $allowed_routes[$this->route] == false) { - return false; - } else { - Framework::getInstance()->initiate(self::$_registry, $this->route, $output); + if (!$query->num_rows) + return false; - if (!empty($allowed_routes[$this->route]) || $force) { - Framework::getInstance()->initiateRouteRequest(); - } else { - $checkRoute = Framework::getInstance()->checkRoute(); - - switch ($checkRoute) { - case Framework::FOUND: - $allowed_routes[$this->route] = true; - break; - case Framework::NOT_FOUND: - $allowed_routes[$this->route] = false; - break; - } + foreach ($query->rows as $route) { + $allowed_routes[$route['method']][] = $route['uri']; } - } - /** - * Cache OpenCore allowed routes for faster rendering - */ - if ($this->routes_cache_time && !$force) { - $cache->set('opencore_routes.' . $appBaseName, $allowed_routes, time() + $this->routes_cache_time); + /** + * Cache OpenCore allowed routes for faster rendering + */ + $this->cache->set('opencore_routes', $allowed_routes, time() + $this->routes_cache_time); } - if (!empty($allowed_routes[$this->route]) || $force) { - return Framework::getInstance()->handle(); + $requestMethod = $_SERVER['REQUEST_METHOD']; + if (!empty($allowed_routes[$requestMethod])) { + foreach ($allowed_routes[$requestMethod] as $route) { + if (preg_match_all('/\{(.*?)\??\}/', $route, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { + foreach ($matches[0] as $match) { + $remainingUri = substr($this->route, $match[1], strlen($this->route)); + $getSamePartFromRoute = strtok($remainingUri, '/'); + $route = substr_replace($route, $getSamePartFromRoute, $match[1], strlen($match[0])); + } + } + + if ($route === $this->route) { + return true; + } + } } return false; @@ -199,14 +198,4 @@ public static function getRegistry($type = '') return $registry; } - - /** - * Retrieves OpenCart variables defined when the controller was loaded - * - * @return object - */ - public function getOcVars() - { - return $this->data; - } } From d18802d3b24940a2a1c3b1a95a585674b7e25f52 Mon Sep 17 00:00:00 2001 From: DaRock Date: Sun, 26 Jan 2020 15:21:20 +0200 Subject: [PATCH 10/10] Small optimizations & Readme update --- README.md | 15 +++++++++++++-- config/app.php | 4 ++-- support/Opencart/Startup.php | 20 +++++++------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 8386269..ffe0588 100644 --- a/README.md +++ b/README.md @@ -50,8 +50,8 @@ check Laravel requirements because they may differ depending on the used version 4. `cd core/` 5. `composer update` 6. `php artisan key:generate` -7. `php artisan migrate:install` -8. `php artisan migrate` +7. `php artisan migrate` +8. `php artisan opencore:register-routes` 9. copy OpenCart extension files from core/opencart-module/(2.x|3.x)/upload to you OpenCart root folder 10. go to OpenCart admin panel / extensions / extensions / modules, find OpenCore module and install it 11. click on the OpenCore icon from admin / left column / section "System Requirements" and make sure there's nothing marked with red @@ -59,6 +59,16 @@ check Laravel requirements because they may differ depending on the used version Enjoy! +## Update + +1. `cd core/` +2. `git update` +3. `composer update` +4. `php artisan migrate` +5. `php artisan opencore:register-routes` +6. copy OpenCart extension files from core/opencart-module/(2.x|3.x)/upload to you OpenCart root folder +7. Optional: go to OpenCart / extensions / modules, disable and then re-enable the OpenCore module + ## How does it works ? Let's take this file from OpenCart system: `/admin/controller/common/header.php` @@ -109,6 +119,7 @@ MIT license. Please see the [license file](LICENSE) for more information. ## TODO +* create a console command for faster instalation / update * force paginator->appends to automatically add token/user_token param for admin requests only * when enabling a module the permission must be added automatically for the user who made the action * Example & Developer modules should be disabled by default diff --git a/config/app.php b/config/app.php index 1fbae68..7a68ad7 100644 --- a/config/app.php +++ b/config/app.php @@ -170,7 +170,7 @@ * Application Service Providers... */ App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, + //App\Providers\AuthServiceProvider::class, // App\Providers\BroadcastServiceProvider::class, App\Providers\EventServiceProvider::class, App\Providers\RouteServiceProvider::class, @@ -195,7 +195,7 @@ 'App' => Illuminate\Support\Facades\App::class, 'Arr' => Illuminate\Support\Arr::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class, - 'Auth' => Illuminate\Support\Facades\Auth::class, + //'Auth' => Illuminate\Support\Facades\Auth::class, 'Blade' => Illuminate\Support\Facades\Blade::class, 'Broadcast' => Illuminate\Support\Facades\Broadcast::class, 'Bus' => Illuminate\Support\Facades\Bus::class, diff --git a/support/Opencart/Startup.php b/support/Opencart/Startup.php index a0bd402..20e5686 100644 --- a/support/Opencart/Startup.php +++ b/support/Opencart/Startup.php @@ -147,6 +147,10 @@ public function checkOpenCoreRoute() $requestMethod = $_SERVER['REQUEST_METHOD']; if (!empty($allowed_routes[$requestMethod])) { + if (in_array($this->route, $allowed_routes[$requestMethod])) { + return true; + } + foreach ($allowed_routes[$requestMethod] as $route) { if (preg_match_all('/\{(.*?)\??\}/', $route, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) { foreach ($matches[0] as $match) { @@ -154,10 +158,10 @@ public function checkOpenCoreRoute() $getSamePartFromRoute = strtok($remainingUri, '/'); $route = substr_replace($route, $getSamePartFromRoute, $match[1], strlen($match[0])); } - } - if ($route === $this->route) { - return true; + if ($route === $this->route) { + return true; + } } } } @@ -165,16 +169,6 @@ public function checkOpenCoreRoute() return false; } - /** - * Run function - * - * @execute Framewrok - */ - public function run() - { - Framework::getInstance()->run(); - } - /** * Framework Response function */