diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e9b4371..4bbb819 100755 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -16,7 +16,7 @@ Generally, the development philosophy is result orientated. This means that anyo Developers are encouraged to pick open tasks with high priorities according to their own skill level. Senior developers may directly assign tasks to developers based on their importance. New developers may find it easier to start with a task that has a low priority as they often also have a lower difficulty. -Open tasks can be found in the project overview: [PROJECT.md](../Project/PROJECT.md) +Open tasks can be found in the project overview: [PROJECT.md](https://github.com/Karaka-Management/Organization-Guide/blob/master/Project/PROJECT.md) Tasks currently in development are prefixed in the priority column with an asterisk `*` and a name tag in the task description of the developer who is working on the task. diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 05a91de..451bb23 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -42,7 +42,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringGeneral(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-dashboard'); @@ -65,7 +65,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringLogList(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs'); @@ -88,7 +88,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringLogEntry(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-logs-single'); @@ -111,7 +111,7 @@ final class BackendController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function viewMonitoringSecurityDashboard(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function viewMonitoringSecurityDashboard(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { $view = new View($this->app->l11nManager, $request, $response); $view->setTemplate('/Modules/Monitoring/Theme/Backend/monitoring-security'); diff --git a/Controller/CliController.php b/Controller/CliController.php index 6fc89dd..dac6511 100644 --- a/Controller/CliController.php +++ b/Controller/CliController.php @@ -45,10 +45,11 @@ final class CliController extends Controller * @since 1.0.0 * @codeCoverageIgnore */ - public function cliLogReport(RequestAbstract $request, ResponseAbstract $response, $data = null) : RenderableInterface + public function cliLogReport(RequestAbstract $request, ResponseAbstract $response, mixed $data = null) : RenderableInterface { //return new NullView(); + /** @var array $emailSettings */ $emailSettings = $this->app->appSettings->get( names: [ SettingsEnum::MAIL_SERVER_ADDR, @@ -60,8 +61,10 @@ final class CliController extends Controller module: 'Admin' ); + /** @var \Modules\Admin\Models\Account $account */ $account = AccountMapper::get()->where('id', 1)->execute(); + /** @var \phpOMS\Message\Mail\MailHandler $mailHandler */ $mailHandler = $this->app->moduleManager->get('Admin', 'Api')->setUpServerMailHandler(); $mail = new Email(); diff --git a/Theme/Backend/monitoring-logs-single.tpl.php b/Theme/Backend/monitoring-logs-single.tpl.php index 40538dd..17817e0 100755 --- a/Theme/Backend/monitoring-logs-single.tpl.php +++ b/Theme/Backend/monitoring-logs-single.tpl.php @@ -18,18 +18,16 @@ declare(strict_types=1); $logger = $this->getData('logger'); -$log = $logger->getByLine((int) $this->request->getData('id') ?? 1); -$temp = \trim($log[9]); -$log['backtrace'] = \json_decode($temp, true); +$log = $logger->getByLine((int) $this->request->getData('id') ?? 1); -$details = '* Uri: `' . \trim($log[8]) . "`\n" - . '* Level: `' . \trim($log[1]) . "`\n" - . '* File: `' . \trim($log[8]) . "`\n" - . '* Line: `' . \trim($log[3]) . "`\n" - . '* Version: `' . \trim($log[4]) . "`\n" - . '* OS: `' . \trim($log[5]) . "`\n\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"; +$details = '* Uri: `' . \trim($log[8] ?? '') . "`\n" + . '* Level: `' . \trim($log[1] ?? '') . "`\n" + . '* File: `' . \trim($log[8] ?? '') . "`\n" + . '* Line: `' . \trim($log[3] ?? '') . "`\n" + . '* Version: `' . \trim($log[4] ?? '') . "`\n" + . '* OS: `' . \trim($log[5] ?? '') . "`\n\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(); ?> @@ -45,52 +43,52 @@ echo $this->getData('nav')->render(); ?>
- +
- +
- +
- - + +
- +
- +
- +
- +
- +
-
printHtml(\json_encode($log[9], \JSON_PRETTY_PRINT)); ?>
+
printHtml(\json_encode(\json_decode($log[9] ?? '{}'), \JSON_PRETTY_PRINT)); ?>