kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-23 14:26:58 +00:00
Code Issues Projects Releases Wiki Activity

Add installation ID

Browse Source
This commit is contained in:
James Cole
2020-02-23 06:36:58 +01:00
parent 6c163ebef3
commit fb77210f2c
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/DebugController.php
View File

@@ -118,6 +118,7 @@ class DebugController extends Controller
$search = ['~', '#']; $search = ['~', '#'];
$replace = ['\~', '# ']; $replace = ['\~', '# '];
$installationId = app('fireflyconfig')->get('installation_id', '')->data;
$phpVersion = str_replace($search, $replace, PHP_VERSION); $phpVersion = str_replace($search, $replace, PHP_VERSION);
$phpOs = str_replace($search, $replace, PHP_OS); $phpOs = str_replace($search, $replace, PHP_OS);
$interface = PHP_SAPI; $interface = PHP_SAPI;
@@ -126,8 +127,6 @@ class DebugController extends Controller
$drivers = implode(', ', DB::availableDrivers()); $drivers = implode(', ', DB::availableDrivers());
$currentDriver = DB::getDriverName(); $currentDriver = DB::getDriverName();
$userAgent = $request->header('user-agent'); $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'); $trustedProxies = config('firefly.trusted_proxies');
$displayErrors = ini_get('display_errors'); $displayErrors = ini_get('display_errors');
$errorReporting = $this->errorReporting((int)ini_get('error_reporting')); $errorReporting = $this->errorReporting((int)ini_get('error_reporting'));
@@ -174,8 +173,9 @@ class DebugController extends Controller
return view( return view(
'debug', compact( 'debug', compact(
'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver', 'loginProvider', 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'logChannel', 'appLogLevel', 'now', 'drivers', 'currentDriver',
'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isSandstorm', 'trustedProxies', 'toSandbox' 'loginProvider',
'userAgent', 'displayErrors', 'installationId', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'trustedProxies'
) )
); );
} }

5
resources/views/v1/debug.twig
View File

@@ -19,6 +19,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| --- | --- | | --- | --- |
| FF version | {{ FF_VERSION }} | | FF version | {{ FF_VERSION }} |
| FF API version | {{ config('firefly.api_version') }} | | FF API version | {{ config('firefly.api_version') }} |
| Installation ID | {{ installationId }} |
| App environment | {{ appEnv }} | | App environment | {{ appEnv }} |
| App debug mode | {{ appDebug }} | | App debug mode | {{ appDebug }} |
| App cache driver | {{ cacheDriver }} | | App cache driver | {{ cacheDriver }} |
@@ -38,10 +39,6 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION
| DB drivers | {{ drivers }} | | DB drivers | {{ drivers }} |
| Current driver | {{ currentDriver }} | | Current driver | {{ currentDriver }} |
| Login provider | {{ loginProvider }} | | 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 }} | | Trusted proxies (.env) | {{ trustedProxies }} |
| User agent | {{ userAgent }} | | User agent | {{ userAgent }} |
| Loaded extensions | {{ extensions }} | | Loaded extensions | {{ extensions }} |