From 58fe7aadd3436b1d324bf7fbad2de090209ddfd0 Mon Sep 17 00:00:00 2001 From: singularity43 <46550600+singularity43@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:24:59 -0500 Subject: [PATCH 1/6] (Update) AutoBan Console Command Send correct parameters to BanUser Mail. (Further commits to come). --- app/Console/Commands/AutoBan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/AutoBan.php b/app/Console/Commands/AutoBan.php index b04a53d5ca..47684bba9c 100644 --- a/app/Console/Commands/AutoBan.php +++ b/app/Console/Commands/AutoBan.php @@ -68,7 +68,7 @@ public function handle() $logban->save(); // Send Email - Mail::to($ban->warneduser->email)->send(new BanUser($logban)); + Mail::to($ban->warneduser->email)->send(new BanUser($ban->warneduser->email,$logban)); } } } From d72a6363ef5dd01d2ca833689492d941663054dd Mon Sep 17 00:00:00 2001 From: singularity43 <46550600+singularity43@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:26:33 -0500 Subject: [PATCH 2/6] (Update) BanController Update to send correct parameters to fixed Mail BanUser/UnbanUser call. Commits coming. --- app/Http/Controllers/Staff/BanController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php index 326d2fbdc8..fb58337516 100644 --- a/app/Http/Controllers/Staff/BanController.php +++ b/app/Http/Controllers/Staff/BanController.php @@ -100,7 +100,7 @@ public function ban(Request $request, $username, $id) \LogActivity::addToLog("Staff Member {$staff->username} has banned member {$user->username}."); // Send Email - Mail::to($user->email)->send(new BanUser($user, $ban)); + Mail::to($user->email)->send(new BanUser($user->email, $ban)); return redirect()->route('profile', ['username' => $user->username, 'id' => $user->id]) ->with($this->toastr->success('User Is Now Banned!', 'Yay!', ['options'])); @@ -156,7 +156,7 @@ public function unban(Request $request, $username, $id) \LogActivity::addToLog("Staff Member {$staff->username} has unbanned member {$user->username}."); // Send Email - Mail::to($user->email)->send(new UnbanUser($user, $ban)); + Mail::to($user->email)->send(new UnbanUser($user->email, $ban)); return redirect()->route('profile', ['username' => $user->username, 'id' => $user->id]) ->with($this->toastr->success('User Is Now Relieved Of His Ban!', 'Yay!', ['options'])); From 13056cf97665141c305b5b15b1a76c6e0ce4e8b4 Mon Sep 17 00:00:00 2001 From: singularity43 <46550600+singularity43@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:27:39 -0500 Subject: [PATCH 3/6] (Update) BanUser Mail Update to receive correct parameters from Controllers/Commands. --- app/Mail/BanUser.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Mail/BanUser.php b/app/Mail/BanUser.php index 3e80004136..7c63dc77d4 100644 --- a/app/Mail/BanUser.php +++ b/app/Mail/BanUser.php @@ -21,16 +21,18 @@ class BanUser extends Mailable { use Queueable, SerializesModels; - public $logban; + public $email; + public $ban; /** * Create a new message instance. * * @return void */ - public function __construct($logban) + public function __construct($email, $ban) { - $this->logban = $logban; + $this->email = $email; + $this->ban = $ban; } /** From bf5950f5a327cd2bc7a5eda6df1b0b2835dfa0e1 Mon Sep 17 00:00:00 2001 From: singularity43 <46550600+singularity43@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:28:18 -0500 Subject: [PATCH 4/6] (Update) UnbanUser Mail Update to receive correct parameters from controllers/commands. --- app/Mail/UnbanUser.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Mail/UnbanUser.php b/app/Mail/UnbanUser.php index 46cc4f8c8d..b37536db57 100644 --- a/app/Mail/UnbanUser.php +++ b/app/Mail/UnbanUser.php @@ -22,15 +22,17 @@ class UnbanUser extends Mailable use Queueable, SerializesModels; public $email; + public $ban; /** * Create a new message instance. * * @return void */ - public function __construct($email) + public function __construct($email, $ban) { $this->email = $email; + $this->ban = $ban; } /** From 93895a3735274ae3491a79e186daa246144dd432 Mon Sep 17 00:00:00 2001 From: singularity43 <46550600+singularity43@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:29:09 -0500 Subject: [PATCH 5/6] (Update) Ban Mail View Update to receive correct parameters from Ban / Unban Mail calls. Commit set complete. --- resources/views/emails/ban.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/emails/ban.blade.php b/resources/views/emails/ban.blade.php index 91b12c0dba..5c4d3c9a83 100644 --- a/resources/views/emails/ban.blade.php +++ b/resources/views/emails/ban.blade.php @@ -1,7 +1,7 @@ @component('mail::message') # @lang('email.banned-header')! -**Reason:** {{ $logban->ban_reason }} +**Reason:** {{ $ban->ban_reason }} *@lang('email.banned-footer')* @endcomponent From 2826d69f64f114df8f204ccb53b0ea8da237264b Mon Sep 17 00:00:00 2001 From: HDVinnie Date: Thu, 10 Jan 2019 19:53:35 -0500 Subject: [PATCH 6/6] (Update) AutoBan Command - apply StyleCI fix --- app/Console/Commands/AutoBan.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Console/Commands/AutoBan.php b/app/Console/Commands/AutoBan.php index 47684bba9c..15a48cdaea 100644 --- a/app/Console/Commands/AutoBan.php +++ b/app/Console/Commands/AutoBan.php @@ -68,7 +68,7 @@ public function handle() $logban->save(); // Send Email - Mail::to($ban->warneduser->email)->send(new BanUser($ban->warneduser->email,$logban)); + Mail::to($ban->warneduser->email)->send(new BanUser($ban->warneduser->email, $logban)); } } }