From 307a9e52de631024b0c3e547c7d5b541cdeaecf1 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 30 May 2018 13:39:00 +0200 Subject: [PATCH] Use root namespace --- Admin/Install/Navigation.php | 2 +- Theme/Backend/monitoring-logs-single.tpl.php | 8 ++++---- Theme/Backend/monitoring-logs.tpl.php | 2 +- Theme/Backend/monitoring-security-file-list.tpl.php | 2 +- Theme/Backend/monitoring-security.tpl.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index b46e480..924e104 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -38,7 +38,7 @@ class Navigation */ public static function install(string $path = null, DatabasePool $dbPool = null) : void { - $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); + $navData = \json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); $class = '\\Modules\\Navigation\\Admin\\Installer'; /** @var $class \Modules\Navigation\Admin\Installer */ diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php index ad7dcb5..e5b6e55 100644 --- a/Theme/Backend/monitoring-logs-single.tpl.php +++ b/Theme/Backend/monitoring-logs-single.tpl.php @@ -16,7 +16,7 @@ $log = $this->app->logger->getByLine((int) $this->request->getData('id') ?? 1); $temp = trim($log['backtrace']); -$log['backtrace'] = json_decode($temp, true); +$log['backtrace'] = \json_decode($temp, true); $details = '* Uri: `' . trim($log['path']) . "`\n" . '* Level: `' . trim($log['level']) . "`\n" @@ -25,7 +25,7 @@ $details = '* Uri: `' . trim($log['path']) . "`\n" . '* Line: `' . trim($log['line']) . "`\n" . '* Version: `' . trim($log['version']) . "`\n" . '* OS: `' . trim($log['os']) . "`\n\n" - . "Backtrace: \n\n```\n" . json_encode($log['backtrace'], JSON_PRETTY_PRINT); + . "Backtrace: \n\n```\n" . \json_encode($log['backtrace'], JSON_PRETTY_PRINT); echo $this->getData('nav')->render(); ?> @@ -55,7 +55,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Level') ?> - + printHtml($log['level']); ?> getHtml('Message') ?> @@ -81,7 +81,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Backtrace') ?> -
printHtml(json_encode($log['backtrace'], JSON_PRETTY_PRINT)); ?>
+
printHtml(\json_encode($log['backtrace'], JSON_PRETTY_PRINT)); ?>
getHtml('Report') ?> diff --git a/Theme/Backend/monitoring-logs.tpl.php b/Theme/Backend/monitoring-logs.tpl.php index 512ee17..2b24224 100644 --- a/Theme/Backend/monitoring-logs.tpl.php +++ b/Theme/Backend/monitoring-logs.tpl.php @@ -35,7 +35,7 @@ echo $this->getData('nav')->render(); ?> $url = \phpOMS\Uri\UriFactory::build('/{/lang}/backend/admin/monitoring/logs/single?{?}&id=' . $key);?> printHtml($url); ?>> printHtml($value[0] ?? ''); ?> - printHtml($url); ?>> printHtml($value[1] ?? ''); ?> + printHtml($url); ?>> printHtml($value[1] ?? ''); ?> printHtml($url); ?>> printHtml($value[2] ?? ''); ?> printHtml($url); ?>> printHtml($value[7] ?? ''); ?> getData('nav')->render(); ?> getHtml('Deprecated') ?> getHtml('Integrity') ?> - $file) : $source = file_get_contents($file); ?> + $file) : $source = \file_get_contents($file); ?> diff --git a/Theme/Backend/monitoring-security.tpl.php b/Theme/Backend/monitoring-security.tpl.php index f26c79c..6ab1352 100644 --- a/Theme/Backend/monitoring-security.tpl.php +++ b/Theme/Backend/monitoring-security.tpl.php @@ -48,7 +48,7 @@ echo $this->getData('nav')->render(); ?> getHtml('Modified') ?> getHtml('Integrity') ?> - +