From 535e32b5617d096669f940d942d06dc9e8acd536 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 9 Apr 2016 10:42:22 +0200 Subject: [PATCH] Fixing remaining bugs for route-restructure --- Admin/Installer.php | 2 +- Admin/Routes/http.php | 2 ++ Controller.php | 6 +++--- Theme/Backend/Lang/Navigation.en.lang.php | 4 ++-- Theme/Backend/Lang/en.lang.php | 4 ++-- Theme/backend/Lang/Navigation.en.lang.php | 4 ++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 31e06e9..6e7427f 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -15,9 +15,9 @@ */ namespace Modules\Monitoring\Admin; - use phpOMS\DataStorage\Database\Pool; use phpOMS\Module\InstallerAbstract; +use phpOMS\Module\InfoManager; /** * Monitoring install class. diff --git a/Admin/Routes/http.php b/Admin/Routes/http.php index a1d31da..6197c4c 100644 --- a/Admin/Routes/http.php +++ b/Admin/Routes/http.php @@ -1,5 +1,7 @@ [ [ diff --git a/Controller.php b/Controller.php index 04f8464..70e68ef 100644 --- a/Controller.php +++ b/Controller.php @@ -90,7 +90,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard'); @@ -109,7 +109,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs'); @@ -128,7 +128,7 @@ class Controller extends ModuleAbstract implements WebInterface * @since 1.0.0 * @author Dennis Eichhorn */ - public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : \Serializable { $view = new View($this->app, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single'); diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index 4733b79..5df946d 100644 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Navigation'] = [ +return ['Navigation' => [ 'List' => 'List', 'Logs' => 'Logs', 'Monitoring' => 'Monitoring', -]; +]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 3f6d03a..c4fdc0c 100644 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,7 +13,7 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Monitoring'] = [ +return ['Monitoring' => [ 'Alerts' => 'Alerts', 'All' => 'All', 'Backtrace' => 'Backtrace', @@ -51,4 +51,4 @@ $MODLANG['Monitoring'] = [ 'Uri' => 'Uri', 'Version' => 'Version', 'Warnings' => 'Warnings', -]; +]]; diff --git a/Theme/backend/Lang/Navigation.en.lang.php b/Theme/backend/Lang/Navigation.en.lang.php index 4733b79..5df946d 100644 --- a/Theme/backend/Lang/Navigation.en.lang.php +++ b/Theme/backend/Lang/Navigation.en.lang.php @@ -13,8 +13,8 @@ * @version 1.0.0 * @link http://orange-management.com */ -$MODLANG['Navigation'] = [ +return ['Navigation' => [ 'List' => 'List', 'Logs' => 'Logs', 'Monitoring' => 'Monitoring', -]; +]];