kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Make upload size globally available #2828

Browse Source
This commit is contained in:
James Cole
2020-03-19 08:43:52 +01:00
parent 75afe35e98
commit 6129b9d25c
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BillController.php
View File

@@ -66,10 +66,6 @@ class BillController extends Controller
{ {
parent::__construct(); parent::__construct();
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
app('view')->share('showBudget', true); app('view')->share('showBudget', true);
$this->middleware( $this->middleware(

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

@@ -61,6 +61,14 @@ class Controller extends BaseController
app('view')->share('DEMO_PASSWORD', config('firefly.demo_password')); app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
app('view')->share('FF_VERSION', config('firefly.version')); app('view')->share('FF_VERSION', config('firefly.version'));
// upload size
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
// share is alpha, is beta // share is alpha, is beta
$isAlpha = false; $isAlpha = false;
if (false !== strpos(config('firefly.version'), 'alpha')) { if (false !== strpos(config('firefly.version'), 'alpha')) {

4
app/Http/Controllers/Transaction/CreateController.php
View File

@@ -46,10 +46,6 @@ class CreateController extends Controller
{ {
parent::__construct(); parent::__construct();
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
$this->middleware( $this->middleware(
static function ($request, $next) { static function ($request, $next) {
app('view')->share('title', (string) trans('firefly.transactions')); app('view')->share('title', (string) trans('firefly.transactions'));

7
app/Http/Controllers/Transaction/EditController.php
View File

@@ -47,13 +47,6 @@ class EditController extends Controller
{ {
parent::__construct(); parent::__construct();
$maxFileSize = app('steam')->phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = app('steam')->phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
app('view')->share('uploadSize', $uploadSize);
// some useful repositories: // some useful repositories:
$this->middleware( $this->middleware(
static function ($request, $next) { static function ($request, $next) {