From 2e65055c9ab332a579a4fa488049e8a64bd9750c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 19 Feb 2023 08:02:13 +0100 Subject: [PATCH] Add max upload size to debug page. --- app/Http/Controllers/DebugController.php | 9 +++++---- resources/views/debug.twig | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 324645db1e..0cc8b02bd5 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Artisan; -use Carbon\Carbon; use DB; use Exception; use FireflyConfig; @@ -35,11 +34,9 @@ use Illuminate\Contracts\View\Factory; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Routing\Redirector; -use Illuminate\Routing\Route; use Illuminate\View\View; use Log; use Monolog\Handler\RotatingFileHandler; -use Route as RouteFacade; /** * Class DebugController @@ -141,6 +138,9 @@ class DebugController extends Controller $cacheDriver = config('cache.default'); $logChannel = config('logging.default'); $appLogLevel = config('logging.level'); + $maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize')); + $maxPostSize = app('steam')->phpBytes(ini_get('post_max_size')); + $uploadSize = min($maxFileSize, $maxPostSize); $displayErrors = ini_get('display_errors'); $errorReporting = $this->errorReporting((int)ini_get('error_reporting')); $interface = PHP_SAPI; @@ -179,7 +179,7 @@ class DebugController extends Controller setlocale(LC_ALL, $original); // get latest log file: - $logger = Log::driver(); + $logger = Log::driver(); // PHPstan doesn't recognize the method because of its polymorphic nature. $handlers = $logger->getHandlers(); // @phpstan-ignore-line $logContent = ''; @@ -208,6 +208,7 @@ class DebugController extends Controller 'logChannel', 'stateful', 'tz', + 'uploadSize', 'appLogLevel', 'remoteHeader', 'remoteMailHeader', diff --git a/resources/views/debug.twig b/resources/views/debug.twig index 6f1de2a4f0..ad21d35f07 100644 --- a/resources/views/debug.twig +++ b/resources/views/debug.twig @@ -33,6 +33,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION | App logging | {{ appLogLevel }}, {{ logChannel }} | | Display errors | {{ displayErrors }} | | Error reporting | {{ errorReporting }} | +| Max upload | {{ uploadSize }} ({{ uploadSize|filesize }}) | | Interface | {{ interface }} | | Default language | {{ defaultLanguage }} | | Default locale | {{ defaultLocale }} |