diff --git a/admin/index.php b/admin/index.php index 3974f953..f9c9af9a 100644 --- a/admin/index.php +++ b/admin/index.php @@ -35,6 +35,27 @@ require_once SYSTEM . 'hooks.php'; $hooks = new Hooks(); $hooks->load(); +$hooks->register('debugbar_admin_head_end', HOOK_ADMIN_HEAD_END, function ($params) { + global $debugBar; + + if (!isset($debugBar)) { + return; + } + + $debugBarRenderer = $debugBar->getJavascriptRenderer(); + echo $debugBarRenderer->renderHead(); +}); +$hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($params) { + global $debugBar; + + if (!isset($debugBar)) { + return; + } + + $debugBarRenderer = $debugBar->getJavascriptRenderer(); + echo $debugBarRenderer->render(); +}); + require SYSTEM . 'status.php'; require SYSTEM . 'login.php'; require __DIR__ . '/includes/functions.php'; diff --git a/composer.json b/composer.json index b1300e34..00e32782 100644 --- a/composer.json +++ b/composer.json @@ -14,6 +14,7 @@ "matomo/device-detector": "^6.0" }, "require-dev": { - "filp/whoops": "^2.15" + "filp/whoops": "^2.15", + "maximebf/debugbar": "1.*" } } diff --git a/system/functions.php b/system/functions.php index 11803c69..976565f4 100644 --- a/system/functions.php +++ b/system/functions.php @@ -457,20 +457,30 @@ function tickers() */ function template_place_holder($type): string { - global $twig, $template_place_holders; + global $twig, $template_place_holders, $debugBar; $ret = ''; + if (isset($debugBar)) { + $debugBarRenderer = $debugBar->getJavascriptRenderer(); + } + if(array_key_exists($type, $template_place_holders) && is_array($template_place_holders[$type])) $ret = implode($template_place_holders[$type]); if($type === 'head_start') { $ret .= template_header(); + if (isset($debugBar)) { + $ret .= $debugBarRenderer->renderHead(); + } } elseif ($type === 'body_start') { $ret .= $twig->render('browsehappy.html.twig'); } elseif($type === 'body_end') { $ret .= template_ga_code(); + if (isset($debugBar)) { + $ret .= $debugBarRenderer->render(); + } } return $ret; diff --git a/system/init.php b/system/init.php index c941f4d4..1f7acd53 100644 --- a/system/init.php +++ b/system/init.php @@ -13,8 +13,12 @@ if(!isset($config['installed']) || !$config['installed']) { throw new RuntimeException('MyAAC has not been installed yet or there was error during installation. Please install again.'); } +use DebugBar\StandardDebugBar; + if(config('env') === 'dev') { require SYSTEM . 'exception.php'; + + $debugBar = new StandardDebugBar(); } if(empty($config['server_path'])) {