From 11a494cacf865ee6c9bc584fc05b77080e30abdd Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 24 May 2015 12:53:47 +0200 Subject: [PATCH] Remove some middleware, fix cleanup [skip ci] --- app/Http/Kernel.php | 1 - app/Http/Middleware/Cleanup.php | 101 +---------------------------- app/Http/Middleware/PiggyBanks.php | 70 -------------------- app/Http/routes.php | 2 +- 4 files changed, 3 insertions(+), 171 deletions(-) delete mode 100644 app/Http/Middleware/PiggyBanks.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 65a70dc692..f0aac457a4 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -39,7 +39,6 @@ class Kernel extends HttpKernel 'range' => 'FireflyIII\Http\Middleware\Range', 'cleanup' => 'FireflyIII\Http\Middleware\Cleanup', 'reminders' => 'FireflyIII\Http\Middleware\Reminders', - 'piggybanks' => 'FireflyIII\Http\Middleware\PiggyBanks', ]; diff --git a/app/Http/Middleware/Cleanup.php b/app/Http/Middleware/Cleanup.php index 0785807d03..f502d99183 100644 --- a/app/Http/Middleware/Cleanup.php +++ b/app/Http/Middleware/Cleanup.php @@ -153,94 +153,6 @@ class Cleanup } unset($set, $entry, $metadata); - // encrypt account virtual balance amount - $set = Account::whereNull('virtual_balance_encrypted')->take(5)->get(); - /** @var Account $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount; - $entry->virtual_balance = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt bill amount_min - $set = Bill::whereNull('amount_min_encrypted')->take(5)->get(); - /** @var Bill $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount_min; - $entry->amount_min = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt bill amount_max - $set = Bill::whereNull('amount_max_encrypted')->take(5)->get(); - /** @var Bill $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount_max; - $entry->amount_max = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt budget limit amount - $set = BudgetLimit::whereNull('amount_encrypted')->take(5)->get(); - /** @var BudgetLimit $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount; - $entry->amount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt limit repetition amount - $set = LimitRepetition::whereNull('amount_encrypted')->take(5)->get(); - /** @var LimitRepetition $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount; - $entry->amount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - //encrypt piggy bank event amount - $set = PiggyBankEvent::whereNull('amount_encrypted')->take(5)->get(); - /** @var PiggyBankEvent $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount; - $entry->amount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt piggy bank repetition currentamount - $set = PiggyBankRepetition::whereNull('currentamount_encrypted')->take(5)->get(); - /** @var PiggyBankRepetition $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->currentamount; - $entry->currentamount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - - // encrypt piggy bank targetamount - $set = PiggyBank::whereNull('targetamount_encrypted')->take(5)->get(); - /** @var PiggyBank $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->targetamount; - $entry->targetamount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); - //encrypt preference name $set = Preference::whereNull('name_encrypted')->take(5)->get(); /** @var Preference $entry */ @@ -251,7 +163,8 @@ class Cleanup $entry->save(); } unset($set, $entry, $name); - //encrypt preference data (add field) + + //encrypt preference data $set = Preference::whereNull('data_encrypted')->take(5)->get(); /** @var Preference $entry */ foreach ($set as $entry) { @@ -262,16 +175,6 @@ class Cleanup } unset($set, $entry, $data); - // encrypt transaction amount - $set = Transaction::whereNull('amount_encrypted')->take(5)->get(); - /** @var Transaction $entry */ - foreach ($set as $entry) { - $count++; - $amount = $entry->amount; - $entry->amount = $amount; - $entry->save(); - } - unset($set, $entry, $amount); } if ($count == 0 && $run) { Session::flash('warning', 'Please open the .env file and change RUNCLEANUP=true to RUNCLEANUP=false'); diff --git a/app/Http/Middleware/PiggyBanks.php b/app/Http/Middleware/PiggyBanks.php deleted file mode 100644 index eff3e9aea7..0000000000 --- a/app/Http/Middleware/PiggyBanks.php +++ /dev/null @@ -1,70 +0,0 @@ -auth = $auth; - } - - /** - * Handle an incoming request. - * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * - * @return mixed - */ - public function handle(Request $request, Closure $next) - { - if ($this->auth->check() && !$request->isXmlHttpRequest()) { - // get piggy banks without a repetition: - /** @var Collection $set */ - $set = $this->auth->user()->piggybanks() - ->leftJoin('piggy_bank_repetitions', 'piggy_banks.id', '=', 'piggy_bank_repetitions.piggy_bank_id') - ->whereNull('piggy_bank_repetitions.id') - ->get(['piggy_banks.id', 'piggy_banks.startdate', 'piggy_banks.targetdate']); - - /** @var PiggyBank $partialPiggy */ - foreach ($set as $partialPiggy) { - $repetition = new PiggyBankRepetition; - $repetition->piggyBank()->associate($partialPiggy); - $repetition->startdate = $partialPiggy->startdate; - $repetition->targetdate = $partialPiggy->targetdate; - $repetition->currentamount = 0; - $repetition->save(); - } - unset($partialPiggy, $set, $repetition); - } - - return $next($request); - } -} diff --git a/app/Http/routes.php b/app/Http/routes.php index a5960cfce0..0b29fa3385 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -199,7 +199,7 @@ Route::get('/routes', ['uses' => 'HomeController@routes', 'as' => 'routes']); * Home Controller */ Route::group( - ['middleware' => ['auth', 'range', 'reminders', 'piggybanks']], function () { + ['middleware' => ['auth', 'range', 'reminders']], function () { Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index', 'middleware' => 'cleanup']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']);