From ff640477c6bbf118a284feb14c4a52cd9a3a03d4 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 31 Dec 2015 18:05:19 +0100 Subject: [PATCH] Restructure --- Admin/Activate.php | 2 +- Admin/Deactivate.php | 2 +- Admin/Install/Navigation.php | 2 ++ Admin/Uninstall.php | 2 +- Admin/Update.php | 5 ++++- Controller.php | 20 +++++++++---------- .../Lang/Navigation.en.lang.php} | 0 .../Lang/en.lang.php} | 0 info.json | 4 ++-- 9 files changed, 20 insertions(+), 17 deletions(-) rename Theme/{lang/nav.backend.en.lang.php => backend/Lang/Navigation.en.lang.php} (100%) rename Theme/{lang/backend.en.lang.php => backend/Lang/en.lang.php} (100%) diff --git a/Admin/Activate.php b/Admin/Activate.php index c01832b..e7ffb0d 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -15,7 +15,7 @@ */ namespace Modules\Support\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\ActivateAbstract; diff --git a/Admin/Deactivate.php b/Admin/Deactivate.php index a79695a..25846ae 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -15,7 +15,7 @@ */ namespace Modules\Support\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\DeactivateAbstract; diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 289dbee..e58281c 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,6 +14,7 @@ * @link http://orange-management.com */ namespace Modules\Support\Admin\Install; +use phpOMS\DataStorage\Database\Pool; /** * Navigation class. @@ -33,6 +34,7 @@ class Navigation $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $class = '\\Modules\\Navigation\\Admin\\Installer'; + /** @var $class \Modules\Navigation\Admin\Installer */ $class::installExternal($dbPool, $navData); } } diff --git a/Admin/Uninstall.php b/Admin/Uninstall.php index b94821c..43e046d 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -15,7 +15,7 @@ */ namespace Modules\Support\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\UninstallAbstract; diff --git a/Admin/Update.php b/Admin/Update.php index c94b0e6..c31db80 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -15,9 +15,10 @@ */ namespace Modules\Support\Admin; -use phpOMS\DataStorage\Database\DatabaseType; + use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\UpdateAbstract; +use phpOMS\System\FileSystem; /** * Navigation class. @@ -38,6 +39,8 @@ class Update extends UpdateAbstract */ public static function update(Pool $dbPool, array $info) { + FileSystem::deletePath(__DIR__ . '/Update'); + mkdir('Update'); parent::update($dbPool, $info); } } diff --git a/Controller.php b/Controller.php index 9152ba6..d685842 100644 --- a/Controller.php +++ b/Controller.php @@ -62,7 +62,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var \string * @since 1.0.0 */ - protected static $module = 'Support'; + const MODULE_NAME = 'Support'; /** * Localization files. @@ -71,7 +71,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 */ protected static $localization = [ - RequestDestination::BACKEND => ['backend'], + RequestDestination::BACKEND => [''], ]; /** @@ -80,9 +80,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var \string * @since 1.0.0 */ - protected static $providing = [ - 'Content', - ]; + protected static $providing = []; /** * Dependencies. @@ -120,7 +118,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewSupportList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/Support/Theme/backend/support-list'); + $view->setTemplate('/Modules/Support/Theme/Backend/support-list'); $view->addData('nav', $this->createNavigation(1002901101, $request, $response)); return $view; @@ -139,7 +137,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewSupportCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/Support/Theme/backend/ticket-create'); + $view->setTemplate('/Modules/Support/Theme/Backend/ticket-create'); $view->addData('nav', $this->createNavigation(1002901101, $request, $response)); return $view; @@ -158,7 +156,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewSupportAnalysis(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/Support/Theme/backend/support-analysis'); + $view->setTemplate('/Modules/Support/Theme/Backend/support-analysis'); $view->addData('nav', $this->createNavigation(1002901101, $request, $response)); return $view; @@ -177,7 +175,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewSupportSettings(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/Support/Theme/backend/support-settings'); + $view->setTemplate('/Modules/Support/Theme/Backend/support-settings'); $view->addData('nav', $this->createNavigation(1002901101, $request, $response)); return $view; @@ -196,7 +194,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewPrivateSupportDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/Support/Theme/backend/user-support-dashboard'); + $view->setTemplate('/Modules/Support/Theme/Backend/user-support-dashboard'); $view->addData('nav', $this->createNavigation(1002901101, $request, $response)); return $view; @@ -216,7 +214,7 @@ class Controller extends ModuleAbstract implements WebInterface { $nav = Navigation::getInstance($request, $this->app->dbPool); $navView = new NavigationView($this->app, $request, $response); - $navView->setTemplate('/Modules/Navigation/Theme/backend/mid'); + $navView->setTemplate('/Modules/Navigation/Theme/Backend/mid'); $navView->setNav($nav->getNav()); $navView->setLanguage($request->getL11n()->language); $navView->setParent($pageId); diff --git a/Theme/lang/nav.backend.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php similarity index 100% rename from Theme/lang/nav.backend.en.lang.php rename to Theme/backend/Lang/Navigation.en.lang.php diff --git a/Theme/lang/backend.en.lang.php b/Theme/backend/Lang/en.lang.php similarity index 100% rename from Theme/lang/backend.en.lang.php rename to Theme/backend/Lang/en.lang.php diff --git a/info.json b/info.json index e7d9cf3..122b227 100644 --- a/info.json +++ b/info.json @@ -37,7 +37,7 @@ "type": 5, "from": "Support", "for": "Navigation", - "file": "nav.backend" + "file": "Navigation" }, { "pid": [ @@ -46,7 +46,7 @@ ], "type": 5, "for": "Content", - "file": "backend", + "file": "", "from": "Support" } ]