From 3ebe9e9583fec87ecfda3137f0e0fd4a71e68d83 Mon Sep 17 00:00:00 2001 From: DariusIII Date: Tue, 13 Nov 2018 12:12:43 +0000 Subject: [PATCH] Apply fixes from StyleCI [ci skip] [skip ci] --- app/Http/Controllers/Admin/UserController.php | 2 +- app/Http/Controllers/Auth/ForgotPasswordController.php | 3 +-- app/Http/Controllers/Auth/ResetPasswordController.php | 3 +-- app/Http/Controllers/ContactUsController.php | 4 ++-- app/Http/Controllers/ProfileController.php | 1 - app/Jobs/SendAccountChangedEmail.php | 2 +- app/Jobs/SendAccountDeletedEmail.php | 4 ++-- app/Jobs/SendAccountExpiredEmail.php | 3 +-- app/Jobs/SendContactUsEmail.php | 5 +---- app/Jobs/SendInviteEmail.php | 5 +++-- app/Jobs/SendPasswordForgottenEmail.php | 4 ++-- app/Jobs/SendPasswordResetEmail.php | 2 +- app/Models/User.php | 6 +++--- 13 files changed, 19 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 252b90480..a8d60453a 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Admin; -use App\Jobs\SendAccountChangedEmail; use App\Models\User; use App\Models\Invitation; use Illuminate\Http\Request; use Spatie\Permission\Models\Role; +use App\Jobs\SendAccountChangedEmail; use App\Http\Controllers\BasePageController; class UserController extends BasePageController diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index d584acc5b..b8732b31a 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -2,13 +2,12 @@ namespace App\Http\Controllers\Auth; -use App\Jobs\SendPasswordForgottenEmail; use App\Models\User; use App\Models\Settings; use Illuminate\Http\Request; use App\Mail\ForgottenPassword; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Mail; +use App\Jobs\SendPasswordForgottenEmail; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; class ForgotPasswordController extends Controller diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index dcbc6627b..8d89d65c3 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -2,12 +2,11 @@ namespace App\Http\Controllers\Auth; -use App\Jobs\SendPasswordResetEmail; use App\Models\User; use App\Models\Settings; -use App\Mail\PasswordReset; use Illuminate\Http\Request; use App\Http\Controllers\Controller; +use App\Jobs\SendPasswordResetEmail; use Illuminate\Support\Facades\Mail; use Illuminate\Foundation\Auth\ResetsPasswords; diff --git a/app/Http/Controllers/ContactUsController.php b/app/Http/Controllers/ContactUsController.php index b81ff614d..1d525ff89 100644 --- a/app/Http/Controllers/ContactUsController.php +++ b/app/Http/Controllers/ContactUsController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers; -use App\Jobs\SendContactUsEmail; use App\Models\Settings; use Illuminate\Http\Request; +use App\Jobs\SendContactUsEmail; class ContactUsController extends BasePageController { @@ -41,7 +41,7 @@ class ContactUsController extends BasePageController } if (! preg_match("/\n/i", $request->input('useremail'))) { - SendContactUsEmail::dispatch($email, $mailTo, $mailBody); + SendContactUsEmail::dispatch($email, $mailTo, $mailBody); } $msg = "

Thank you for getting in touch with ".Settings::settingValue('site.main.title').'.

'; } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index d93fd2689..ad53c7ba0 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -361,7 +361,6 @@ class ProfileController extends BasePageController $userId = $request->input('id'); if ($userId !== null && $this->userdata->hasRole('Admin') === false && (int) $userId === Auth::id()) { - User::deleteUser($userId); return redirect('login'); diff --git a/app/Jobs/SendAccountChangedEmail.php b/app/Jobs/SendAccountChangedEmail.php index 3cfffe4ce..296bac4cd 100644 --- a/app/Jobs/SendAccountChangedEmail.php +++ b/app/Jobs/SendAccountChangedEmail.php @@ -4,11 +4,11 @@ namespace App\Jobs; use App\Mail\AccountChange; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendAccountChangedEmail implements ShouldQueue { diff --git a/app/Jobs/SendAccountDeletedEmail.php b/app/Jobs/SendAccountDeletedEmail.php index 1127b5d64..a5936d5e4 100644 --- a/app/Jobs/SendAccountDeletedEmail.php +++ b/app/Jobs/SendAccountDeletedEmail.php @@ -2,14 +2,14 @@ namespace App\Jobs; -use App\Mail\AccountDeleted; use App\Models\Settings; +use App\Mail\AccountDeleted; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendAccountDeletedEmail implements ShouldQueue { diff --git a/app/Jobs/SendAccountExpiredEmail.php b/app/Jobs/SendAccountExpiredEmail.php index 188ad2f73..5aaa826f8 100644 --- a/app/Jobs/SendAccountExpiredEmail.php +++ b/app/Jobs/SendAccountExpiredEmail.php @@ -4,11 +4,11 @@ namespace App\Jobs; use App\Mail\AccountExpired; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendAccountExpiredEmail implements ShouldQueue { @@ -28,7 +28,6 @@ class SendAccountExpiredEmail implements ShouldQueue { $this->email = $email; $this->userId = $userId; - } /** diff --git a/app/Jobs/SendContactUsEmail.php b/app/Jobs/SendContactUsEmail.php index e977dd291..94557e01d 100644 --- a/app/Jobs/SendContactUsEmail.php +++ b/app/Jobs/SendContactUsEmail.php @@ -4,11 +4,11 @@ namespace App\Jobs; use App\Mail\ContactUs; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendContactUsEmail implements ShouldQueue { @@ -34,9 +34,6 @@ class SendContactUsEmail implements ShouldQueue $this->mailBody = $mailBody; } - /** - * - */ public function handle() { Mail::to($this->mailTo)->send(new ContactUs($this->email, $this->mailBody)); diff --git a/app/Jobs/SendInviteEmail.php b/app/Jobs/SendInviteEmail.php index b0af522d4..241818945 100644 --- a/app/Jobs/SendInviteEmail.php +++ b/app/Jobs/SendInviteEmail.php @@ -4,11 +4,11 @@ namespace App\Jobs; use App\Mail\SendInvite; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendInviteEmail implements ShouldQueue { @@ -31,7 +31,8 @@ class SendInviteEmail implements ShouldQueue { $this->email = $email; $this->userId = $userId; - $this->url = $url; } + $this->url = $url; + } /** * Execute the job. diff --git a/app/Jobs/SendPasswordForgottenEmail.php b/app/Jobs/SendPasswordForgottenEmail.php index edcb18680..832e4d518 100644 --- a/app/Jobs/SendPasswordForgottenEmail.php +++ b/app/Jobs/SendPasswordForgottenEmail.php @@ -2,13 +2,13 @@ namespace App\Jobs; -use App\Mail\ForgottenPassword; use Illuminate\Bus\Queueable; +use App\Mail\ForgottenPassword; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendPasswordForgottenEmail implements ShouldQueue { diff --git a/app/Jobs/SendPasswordResetEmail.php b/app/Jobs/SendPasswordResetEmail.php index d77dd7121..62d8b73ba 100644 --- a/app/Jobs/SendPasswordResetEmail.php +++ b/app/Jobs/SendPasswordResetEmail.php @@ -4,11 +4,11 @@ namespace App\Jobs; use App\Mail\PasswordReset; use Illuminate\Bus\Queueable; +use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Foundation\Bus\Dispatchable; -use Illuminate\Support\Facades\Mail; class SendPasswordResetEmail implements ShouldQueue { diff --git a/app/Models/User.php b/app/Models/User.php index d0afda257..8360193ae 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -2,12 +2,12 @@ namespace App\Models; -use App\Jobs\SendAccountExpiredEmail; -use App\Jobs\SendInviteEmail; use Illuminate\Support\Str; +use App\Jobs\SendInviteEmail; use Illuminate\Support\Facades\DB; use Spatie\Permission\Models\Role; use Illuminate\Support\Facades\Hash; +use App\Jobs\SendAccountExpiredEmail; use Spatie\Permission\Traits\HasRoles; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\Password; @@ -940,9 +940,9 @@ class User extends Authenticatable $token = \Token::randomString(40); $url = $serverUrl.'register?invitecode='.$token; - Invitation::addInvite($uid, $token); SendInviteEmail::dispatch($emailTo, $uid, $url); + return $url; }