From 4e296d186b494a6ea26d394f751e256fa8b608c1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 15:44:21 +0200 Subject: [PATCH] Continue with getter/setter cleanup --- Controller/BackendController.php | 14 +++++++------- Theme/Backend/monitoring-dashboard.tpl.php | 4 ++-- Theme/Backend/monitoring-logs-single.tpl.php | 4 ++-- Theme/Backend/monitoring-logs.tpl.php | 4 ++-- .../Backend/monitoring-security-file-list.tpl.php | 2 +- Theme/Backend/monitoring-security.tpl.php | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 3d56e85..568c1f3 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -46,9 +46,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response); - $view->setData('logger', $this->app->logger); + $view->data['logger'] = $this->app->logger; return $view; } @@ -69,9 +69,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response); - $view->setData('logger', $this->app->logger); + $view->data['logger'] = $this->app->logger; return $view; } @@ -92,9 +92,9 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response); - $view->setData('logger', $this->app->logger); + $view->data['logger'] = $this->app->logger; return $view; } @@ -115,7 +115,7 @@ final class BackendController extends Controller { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-security'); - $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response)); + $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1000706001, $request, $response); return $view; } diff --git a/Theme/Backend/monitoring-dashboard.tpl.php b/Theme/Backend/monitoring-dashboard.tpl.php index 8f874dc..9058714 100755 --- a/Theme/Backend/monitoring-dashboard.tpl.php +++ b/Theme/Backend/monitoring-dashboard.tpl.php @@ -14,11 +14,11 @@ declare(strict_types=1); use phpOMS\System\SystemUtils; -$logger = $this->getData('logger'); +$logger = $this->data['logger']; $logs = $logger->countLogs(); $penetrators = $logger->getHighestPerpetrator(); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php index 4386991..48c1263 100755 --- a/Theme/Backend/monitoring-logs-single.tpl.php +++ b/Theme/Backend/monitoring-logs-single.tpl.php @@ -16,7 +16,7 @@ declare(strict_types=1); * @var \phpOMS\Views\View $this */ -$logger = $this->getData('logger'); +$logger = $this->data['logger']; $log = $logger->getByLine((int) $this->request->getData('id') ?? 1); @@ -29,7 +29,7 @@ $details = '* Uri: `' . \trim($log[8] ?? '') . "`\n" . "**Message:**\n\n```\n" . \trim($log[7] ?? '') . "\n```\n\n" . "**Backtrace:**\n\n```\n" . \json_encode(\json_decode($log[9] ?? '{}'), \JSON_PRETTY_PRINT) . "\n"; -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php index d646b88..6683b65 100755 --- a/Theme/Backend/monitoring-logs.tpl.php +++ b/Theme/Backend/monitoring-logs.tpl.php @@ -15,11 +15,11 @@ declare(strict_types=1); /** * @var \phpOMS\Views\View $this */ -$logger = $this->getData('logger'); +$logger = $this->data['logger']; $logs = \array_reverse($logger->get(25), true); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/monitoring-security-file-list.tpl.php b/Theme/Backend/monitoring-security-file-list.tpl.php index f5e2dd0..c61296d 100755 --- a/Theme/Backend/monitoring-security-file-list.tpl.php +++ b/Theme/Backend/monitoring-security-file-list.tpl.php @@ -22,7 +22,7 @@ use phpOMS\Uri\HttpUri; $files = \phpOMS\System\File\Local\Directory(__DIR__ . '/../../../../phpOMS', '^.+\.php$'); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>
diff --git a/Theme/Backend/monitoring-security.tpl.php b/Theme/Backend/monitoring-security.tpl.php index 645b7c8..a151e32 100755 --- a/Theme/Backend/monitoring-security.tpl.php +++ b/Theme/Backend/monitoring-security.tpl.php @@ -45,7 +45,7 @@ while($line = \fgets($fp)){ } \fclose($fp); -echo $this->getData('nav')->render(); ?> +echo $this->data['nav']->render(); ?>