From 8b400020ce8c0ed551ee83b6d56cab14e784173d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 27 Aug 2023 08:41:27 +1000 Subject: [PATCH] Updates for blacklist rules --- app/Http/Controllers/AccountController.php | 2 +- app/Http/Requests/Email/SendEmailRequest.php | 5 ++++- app/Http/ValidationRules/Account/BlackListRule.php | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 74b4dcd0c4d5..591041c31c66 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -72,7 +72,7 @@ class AccountController extends BaseController MultiDB::findAndSetDbByAccountKey($account->key); - $cu = CompanyUser::where('user_id', $account->users()->first()->id); + $cu = CompanyUser::query()->where('user_id', $account->users()->first()->id); $company_user = $cu->first(); diff --git a/app/Http/Requests/Email/SendEmailRequest.php b/app/Http/Requests/Email/SendEmailRequest.php index b0264eac2b3c..d917742dfac3 100644 --- a/app/Http/Requests/Email/SendEmailRequest.php +++ b/app/Http/Requests/Email/SendEmailRequest.php @@ -51,7 +51,10 @@ class SendEmailRequest extends Request { $input = $this->all(); - $settings = auth()->user()->company()->settings; + /** @var \App\Models\User $user */ + $user = auth()->user(); + + $settings = $user->company()->settings; if (empty($input['template'])) { $input['template'] = ''; diff --git a/app/Http/ValidationRules/Account/BlackListRule.php b/app/Http/ValidationRules/Account/BlackListRule.php index daa13495e671..7d353c429b53 100644 --- a/app/Http/ValidationRules/Account/BlackListRule.php +++ b/app/Http/ValidationRules/Account/BlackListRule.php @@ -19,6 +19,7 @@ use Illuminate\Contracts\Validation\Rule; class BlackListRule implements Rule { private array $blacklist = [ + 'pretreer.com', 'candassociates.com', 'vusra.com', 'fourthgenet.com',