diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index cd25ce80d8..d0e2dd61e3 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -118,6 +118,7 @@ class DebugController extends Controller $search = ['~', '#']; $replace = ['\~', '# ']; + $installationId = app('fireflyconfig')->get('installation_id', '')->data; $phpVersion = str_replace($search, $replace, PHP_VERSION); $phpOs = str_replace($search, $replace, PHP_OS); $interface = PHP_SAPI; @@ -126,8 +127,6 @@ class DebugController extends Controller $drivers = implode(', ', DB::availableDrivers()); $currentDriver = DB::getDriverName(); $userAgent = $request->header('user-agent'); - $isSandstorm = var_export(config('firefly.is_sandstorm'), true); - $toSandbox = var_export(config('firefly.bunq_use_sandbox'), true); $trustedProxies = config('firefly.trusted_proxies'); $displayErrors = ini_get('display_errors'); $errorReporting = $this->errorReporting((int)ini_get('error_reporting')); @@ -174,9 +173,10 @@ class DebugController extends Controller return view( 'debug', compact( - 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver', 'loginProvider', - 'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm', 'trustedProxies', 'toSandbox' - ) + 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver', + 'loginProvider', + 'userAgent', 'displayErrors', 'installationId', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'trustedProxies' + ) ); } diff --git a/resources/views/v1/debug.twig b/resources/views/v1/debug.twig index fec9827c6e..37742cb623 100644 --- a/resources/views/v1/debug.twig +++ b/resources/views/v1/debug.twig @@ -19,6 +19,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION | --- | --- | | FF version | {{ FF_VERSION }} | | FF API version | {{ config('firefly.api_version') }} | +| Installation ID | {{ installationId }} | | App environment | {{ appEnv }} | | App debug mode | {{ appDebug }} | | App cache driver | {{ cacheDriver }} | @@ -38,10 +39,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION | DB drivers | {{ drivers }} | | Current driver | {{ currentDriver }} | | Login provider | {{ loginProvider }} | -| Using Sandstorm? | {% if SANDSTORM == true %}yes{% else %}no{% endif %} | -{% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %} -| Is Sandstorm (.env) | {{ isSandstorm }} | -| bunq uses sandbox | {{ toSandbox }} | | Trusted proxies (.env) | {{ trustedProxies }} | | User agent | {{ userAgent }} | | Loaded extensions | {{ extensions }} |