From c287bc139c64c3a7e303286430fcf29c258ee13b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 24 Jul 2016 18:51:39 +0200 Subject: [PATCH] Check new list. --- .env.example | 2 -- app/Http/Controllers/Auth/AuthController.php | 12 ++---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.env.example b/.env.example index df8630b39b..0d3284ab7e 100755 --- a/.env.example +++ b/.env.example @@ -42,5 +42,3 @@ SHOW_DEMO_WARNING=false ANALYTICS_ID= RUNCLEANUP=true SITE_OWNER=mail@example.com - -BLOCKED_DOMAINS= \ No newline at end of file diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 7cec83dee4..366a7e5258 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -15,6 +15,7 @@ use Auth; use FireflyIII\Events\UserRegistration; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Support\Facades\FireflyConfig; use FireflyIII\User; use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers; use Illuminate\Foundation\Auth\ThrottlesLogins; @@ -177,16 +178,7 @@ class AuthController extends Controller */ protected function getBlockedDomains() { - $set = explode(',', env('BLOCKED_DOMAINS', '')); - $domains = []; - foreach ($set as $entry) { - $domain = trim($entry); - if (strlen($domain) > 0) { - $domains[] = $domain; - } - } - - return $domains; + return FireflyConfig::get('blocked-domains')->data; } /**