From b17e25c56e768c8c549d9b0fcf6f55748f1db6a2 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 | 18 ++++++++---------- Models/NewsArticleMapper.php | 2 +- .../Lang/Navigation.en.lang.php} | 0 .../Lang/en.lang.php} | 0 info.json | 4 ++-- 10 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 8a74f39..9893684 100644 --- a/Admin/Activate.php +++ b/Admin/Activate.php @@ -15,7 +15,7 @@ */ namespace Modules\News\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 6f28dde..2c618d7 100644 --- a/Admin/Deactivate.php +++ b/Admin/Deactivate.php @@ -15,7 +15,7 @@ */ namespace Modules\News\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 9a2d013..e2e8bc8 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -14,6 +14,7 @@ * @link http://orange-management.com */ namespace Modules\News\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 4bc42a3..12fb9d9 100644 --- a/Admin/Uninstall.php +++ b/Admin/Uninstall.php @@ -15,7 +15,7 @@ */ namespace Modules\News\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 1d2304b..ea1b21e 100644 --- a/Admin/Update.php +++ b/Admin/Update.php @@ -15,9 +15,10 @@ */ namespace Modules\News\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 e601ca8..fc816df 100644 --- a/Controller.php +++ b/Controller.php @@ -65,7 +65,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var \string * @since 1.0.0 */ - protected static $module = 'News'; + const MODULE_NAME = 'News'; /** * Localization files. @@ -74,7 +74,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 */ protected static $localization = [ - RequestDestination::BACKEND => ['backend'], + RequestDestination::BACKEND => [''], ]; /** @@ -83,9 +83,7 @@ class Controller extends ModuleAbstract implements WebInterface * @var \string * @since 1.0.0 */ - protected static $providing = [ - 'Content', - ]; + protected static $providing = []; /** * Dependencies. @@ -121,7 +119,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewNewsDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/News/Theme/backend/news-dashboard'); + $view->setTemplate('/Modules/News/Theme/Backend/news-dashboard'); $view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $news = $this->getNewsListR(20, 0, 'news.news_publish', 'DESC', $this->app->accountManager->get($request->getAccount())); @@ -145,7 +143,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewNewsArticle(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/News/Theme/backend/news-single'); + $view->setTemplate('/Modules/News/Theme/Backend/news-single'); $view->addData('nav', $this->createNavigation(1000701001, $request, $response)); $newsArticleMapper = new NewsArticleMapper($this->app->dbPool->get()); @@ -168,7 +166,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewNewsArchive(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/News/Theme/backend/news-archive'); + $view->setTemplate('/Modules/News/Theme/Backend/news-archive'); $view->addData('nav', $this->createNavigation(1000701001, $request, $response)); return $view; @@ -187,7 +185,7 @@ class Controller extends ModuleAbstract implements WebInterface public function viewNewsCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface { $view = new View($this->app, $request, $response); - $view->setTemplate('/Modules/News/Theme/backend/news-create'); + $view->setTemplate('/Modules/News/Theme/Backend/news-create'); $view->addData('nav', $this->createNavigation(1000701001, $request, $response)); return $view; @@ -290,7 +288,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/Models/NewsArticleMapper.php b/Models/NewsArticleMapper.php index 40db8c8..d5a1a7b 100644 --- a/Models/NewsArticleMapper.php +++ b/Models/NewsArticleMapper.php @@ -67,7 +67,7 @@ class NewsArticleMapper extends DataMapperAbstract * @since 1.0.0 * @author Dennis Eichhorn */ - public function create(&$obj) + public function create($obj) { try { $objId = parent::create($obj); 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 90ee678..19e706c 100644 --- a/info.json +++ b/info.json @@ -37,7 +37,7 @@ "type": 5, "from": "News", "for": "Navigation", - "file": "nav.backend" + "file": "Navigation" }, { "pid": [ @@ -45,7 +45,7 @@ ], "type": 5, "for": "Content", - "file": "backend", + "file": "", "from": "News" } ]