Clean up debug page.

app/Http/Controllers/DebugController.php

@@ -120,49 +120,51 @@ class DebugController extends Controller
      */
     public function index(Request $request)
     {
-        $search  = ['~', '#'];
+        // basic scope information:
-        $replace = ['\~', '# '];
-
         $now               = Carbon::now()->format('Y-m-d H:i:s e');
-        $installationIdConfig = app('fireflyconfig')->get('installation_id', '');
-        $installationId       = $installationIdConfig ? $installationIdConfig->data : '';
-        $phpVersion           = str_replace($search, $replace, PHP_VERSION);
-        $phpOs                = str_replace($search, $replace, PHP_OS);
-        $interface            = PHP_SAPI;
-        $drivers              = implode(', ', DB::availableDrivers());
-        $currentDriver        = DB::getDriverName();
-        $userAgent            = $request->header('user-agent');
-        $trustedProxies       = config('firefly.trusted_proxies');
-        $displayErrors        = ini_get('display_errors');
-        $errorReporting       = $this->errorReporting((int)ini_get('error_reporting'));
-        $appEnv               = config('app.env');
-        $appDebug             = var_export(config('app.debug'), true);
-        $logChannel           = config('logging.default');
-        $appLogLevel          = config('logging.level');
-        $cacheDriver          = config('cache.default');
-        $loginProvider        = config('auth.providers.users.driver');
-        $bcscale              = bcscale();
-        $layout               = env('FIREFLY_III_LAYOUT');
-        $tz                   = env('TZ');
         $buildNr           = '(unknown)';
         $buildDate         = '(unknown)';
-
+        $expectedDBversion = config('firefly.db_version');
+        $foundDBversion    = FireflyConfig::get('db_version', 1)->data;
         if (file_exists('/var/www/counter-main.txt')) {
             $buildNr = trim(file_get_contents('/var/www/counter-main.txt'));
         }
         if (file_exists('/var/www/build-date-main.txt')) {
             $buildDate = trim(file_get_contents('/var/www/build-date-main.txt'));
         }
+        $phpVersion = PHP_VERSION;
+        $phpOs      = PHP_OS;
 
-        // expected + found DB version:
+        // system information
-        $expectedDBversion = config('firefly.db_version');
+        $tz              = env('TZ');
-        $foundDBversion    = FireflyConfig::get('db_version', 1)->data;
+        $appEnv          = config('app.env');
+        $appDebug        = var_export(config('app.debug'), true);
+        $cacheDriver     = config('cache.default');
+        $logChannel      = config('logging.default');
+        $appLogLevel     = config('logging.level');
+        $displayErrors   = ini_get('display_errors');
+        $errorReporting  = $this->errorReporting((int) ini_get('error_reporting'));
+        $interface       = PHP_SAPI;
+        $defaultLanguage = (string) config('firefly.default_language');
+        $defaultLocale   = (string) config('firefly.default_locale');
+        $bcscale         = bcscale();
+        $drivers         = implode(', ', DB::availableDrivers());
+        $currentDriver   = DB::getDriverName();
+        $trustedProxies  = config('firefly.trusted_proxies');
 
-        // some new vars.
+        // user info
-        $defaultLanguage = (string)config('firefly.default_language');
+        $loginProvider    = config('auth.providers.users.driver');
-        $defaultLocale   = (string)config('firefly.default_locale');
+        $userGuard        = config('auth.defaults.guard');
+        $remoteHeader     = $userGuard === 'remote_user_guard' ? config('auth.guard_header') : 'N/A';
+        $remoteMailHeader = $userGuard === 'remote_user_guard' ? config('auth.guard_email') : 'N/A';
         $userLanguage     = app('steam')->getLanguage();
         $userLocale       = app('steam')->getLocale();
+        $userAgent        = $request->header('user-agent');
+
+
+        // expected + found DB version:
+
+        // some new vars.
         $isDocker = env('IS_DOCKER', false);
 
         // set languages, see what happens:
@@ -211,17 +213,18 @@ class DebugController extends Controller
                 'logChannel',
                 'tz',
                 'appLogLevel',
+                'remoteHeader',
+                'remoteMailHeader',
                 'now',
                 'drivers',
                 'currentDriver',
+                'userGuard',
                 'loginProvider',
                 'buildNr',
                 'buildDate',
                 'bcscale',
-                'layout',
                 'userAgent',
                 'displayErrors',
-                'installationId',
                 'errorReporting',
                 'phpOs',
                 'interface',
@@ -260,7 +263,7 @@ class DebugController extends Controller
         $return = ' ';
         /** @var Route $route */
         foreach ($set as $route) {
-            $name = (string)$route->getName();
+            $name = (string) $route->getName();
             if (in_array('GET', $route->methods(), true)) {
                 $found = false;
                 foreach ($ignore as $string) {

resources/views/debug.twig

@@ -17,15 +17,13 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | --- | --- |
 | Firefly III | {{ FF_VERSION }} |
 | Firefly III API | {{ config('firefly.api_version') }} |
-| Build | {{ buildNr}}, {{ buildDate }} |
+| Build | {{ buildNr }}, {{ buildDate }} |
-| PHP | {{ phpVersion }} |
+| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) |
-| Host | {{ phpOs }} |
+| PHP | `{{ phpVersion }}` |
+| Host | `{{ phpOs }}` |
 
 | System info | Value |
 | --- | --- |
-| Installation ID | {{ installationId }} |
-| Using docker? | {% if isDocker %}true{% else %}false{% endif %} |
-| Layout | {{ layout }} |
 | System TZ | {{ tz }} |
 | Browser TZ | [BrowserTZ] |
 | App environment | {{ appEnv }} |
@@ -40,12 +38,13 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
 | BCscale | {{ bcscale }} |
 | DB drivers | {{ drivers }} |
 | Current driver | {{ currentDriver }} |
-| DB version | {{ foundDBversion }} (exp. {{ expectedDBversion}}) |
+| Trusted proxies (.env) | `{{ trustedProxies }}` |
-| Login provider | {{ loginProvider }}  |
-| Trusted proxies (.env) | {{ trustedProxies }} |
 
 | User info | Value |
 | --- | --- |
+| Login provider | {{ loginProvider }}  |
+| User guard | {{ userGuard }}  |
+| Headers | {{ remoteHeader }}, {{ remoteMailHeader }}  |
 | Session start | {{ session('start') }} |
 | Session end | {{ session('end') }} |
 | Session first | {{ session('first') }} |