From 3a06a6ac070ab7e0073b05d79d1b717c0c5d1517 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 5 Jun 2015 09:51:52 +0200 Subject: [PATCH] Removed unnecessary code. --- app/Http/Kernel.php | 1 - app/Http/Middleware/Cleanup.php | 223 -------------------------------- app/Http/routes.php | 2 +- 3 files changed, 1 insertion(+), 225 deletions(-) delete mode 100644 app/Http/Middleware/Cleanup.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index f0aac457a4..30bdc71e89 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -37,7 +37,6 @@ class Kernel extends HttpKernel 'auth.basic' => 'Illuminate\Auth\Middleware\AuthenticateWithBasicAuth', 'guest' => 'FireflyIII\Http\Middleware\RedirectIfAuthenticated', 'range' => 'FireflyIII\Http\Middleware\Range', - 'cleanup' => 'FireflyIII\Http\Middleware\Cleanup', 'reminders' => 'FireflyIII\Http\Middleware\Reminders', ]; diff --git a/app/Http/Middleware/Cleanup.php b/app/Http/Middleware/Cleanup.php deleted file mode 100644 index c2dc5a3e46..0000000000 --- a/app/Http/Middleware/Cleanup.php +++ /dev/null @@ -1,223 +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->guest()) { - return response('Unauthorized.', 401); - } - $count = -1; - - bcscale(0); - - if (env('RUNCLEANUP') == 'true') { - $count = 0; - $count = bcadd($count, $this->encryptAccountAndBills()); - $count = bcadd($count, $this->encryptBudgetsAndCategories()); - $count = bcadd($count, $this->encryptPiggiesAndJournals()); - $count = bcadd($count, $this->encryptRemindersAndPreferences()); - - } - if ($count == 0) { - Session::flash('warning', 'Please open the .env file and change RUNCLEANUP=true to RUNCLEANUP=false'); - } - - return $next($request); - - } - - /** - * @return int - */ - protected function encryptAccountAndBills() - { - $count = 0; - // encrypt account name - $set = Account::where('encrypted', 0)->take(5)->get(); - /** @var Account $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - // encrypt bill name - $set = Bill::where('name_encrypted', 0)->take(5)->get(); - /** @var Bill $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - // encrypt bill match - $set = Bill::where('match_encrypted', 0)->take(5)->get(); - /** @var Bill $entry */ - foreach ($set as $entry) { - $match = $entry->match; - $entry->match = $match; - $entry->save(); - } - unset($set, $entry, $match); - - - return $count; - - } - - /** - * @return int - */ - protected function encryptBudgetsAndCategories() - { - $count = 0; - // encrypt budget name - $set = Budget::where('encrypted', 0)->take(5)->get(); - /** @var Budget $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - // encrypt category name - $set = Category::where('encrypted', 0)->take(5)->get(); - /** @var Category $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - return $count; - } - - /** - * @return int - */ - protected function encryptPiggiesAndJournals() - { - $count = 0; - // encrypt piggy bank name - $set = PiggyBank::where('encrypted', 0)->take(5)->get(); - /** @var PiggyBank $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - // encrypt transaction journal description - $set = TransactionJournal::where('encrypted', 0)->take(5)->get(); - /** @var TransactionJournal $entry */ - foreach ($set as $entry) { - $count++; - $description = $entry->description; - $entry->description = $description; - $entry->save(); - } - unset($set, $entry, $description); - - return $count; - } - - /** - * @return int - */ - protected function encryptRemindersAndPreferences() - { - $count = 0; - // encrypt reminder metadata - $set = Reminder::where('encrypted', 0)->take(5)->get(); - /** @var Reminder $entry */ - foreach ($set as $entry) { - $count++; - $metadata = $entry->metadata; - $entry->metadata = $metadata; - $entry->save(); - } - unset($set, $entry, $metadata); - - //encrypt preference name - $set = Preference::whereNull('name_encrypted')->take(5)->get(); - /** @var Preference $entry */ - foreach ($set as $entry) { - $count++; - $name = $entry->name; - $entry->name = $name; - $entry->save(); - } - unset($set, $entry, $name); - - //encrypt preference data - $set = Preference::whereNull('data_encrypted')->take(5)->get(); - /** @var Preference $entry */ - foreach ($set as $entry) { - $count++; - $data = $entry->data; - $entry->data = $data; - $entry->save(); - } - unset($set, $entry, $data); - - return $count; - } - -} diff --git a/app/Http/routes.php b/app/Http/routes.php index cdff0a70a4..2b66dac023 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -188,7 +188,7 @@ Route::controllers( */ Route::group( ['middleware' => ['auth', 'range', 'reminders']], function () { - Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index', 'middleware' => 'cleanup']); + Route::get('/', ['uses' => 'HomeController@index', 'as' => 'index']); Route::get('/home', ['uses' => 'HomeController@index', 'as' => 'home']); Route::post('/daterange', ['uses' => 'HomeController@dateRange', 'as' => 'daterange']); Route::get('/flush', ['uses' => 'HomeController@flush', 'as' => 'flush']);