diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index e361e1c84..a26bbd316 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers\Admin; -use App\Jobs\SendAccountDeletedEmail; use App\Models\User; use App\Models\Invitation; use Illuminate\Http\Request; diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 2554c95db..cf4f6ce9f 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -73,16 +73,16 @@ class ResetPasswordController extends Controller $confirmed = true; } - $theme = Settings::settingValue('site.main.style'); + $theme = Settings::settingValue('site.main.style'); - $title = 'Forgotten Password'; - $meta_title = 'Forgotten Password'; - $meta_keywords = 'forgotten,password,signup,registration'; - $meta_description = 'Forgotten Password'; + $title = 'Forgotten Password'; + $meta_title = 'Forgotten Password'; + $meta_keywords = 'forgotten,password,signup,registration'; + $meta_description = 'Forgotten Password'; - $content = app('smarty.view')->fetch($theme.'/forgottenpassword.tpl'); + $content = app('smarty.view')->fetch($theme.'/forgottenpassword.tpl'); - app('smarty.view')->assign( + app('smarty.view')->assign( [ 'content' => $content, 'title' => $title, @@ -95,6 +95,6 @@ class ResetPasswordController extends Controller 'notice' => $onscreen, ] ); - app('smarty.view')->display($theme.'/basepage.tpl'); + app('smarty.view')->display($theme.'/basepage.tpl'); } } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 8e22007cf..321e74b00 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Jobs\SendAccountDeletedEmail; use App\Models\User; use Blacklight\NZBGet; use Blacklight\SABnzbd; @@ -13,7 +12,7 @@ use App\Models\UserDownload; use Illuminate\Http\Request; use App\Models\ReleaseComment; use Blacklight\utility\Utility; -use Illuminate\Support\Facades\Auth; +use App\Jobs\SendAccountDeletedEmail; use Jrean\UserVerification\Facades\UserVerification; class ProfileController extends BasePageController @@ -361,10 +360,11 @@ class ProfileController extends BasePageController $this->setPrefs(); $userId = $request->input('id'); - if ($userId !== null && (int) $userId === $this->userdata->id && $this->userdata->hasRole('Admin') === false ) { + if ($userId !== null && (int) $userId === $this->userdata->id && $this->userdata->hasRole('Admin') === false) { $user = User::find($userId); SendAccountDeletedEmail::dispatch($user); User::deleteUser($user->id); + return redirect('login'); } diff --git a/app/Jobs/SendAccountChangedEmail.php b/app/Jobs/SendAccountChangedEmail.php index 352d33d3d..15bb94aef 100644 --- a/app/Jobs/SendAccountChangedEmail.php +++ b/app/Jobs/SendAccountChangedEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Mail\AccountChange; use App\Models\User; +use App\Mail\AccountChange; use Illuminate\Bus\Queueable; use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; diff --git a/app/Jobs/SendAccountDeletedEmail.php b/app/Jobs/SendAccountDeletedEmail.php index 3ea4fdd1c..bb85e4055 100644 --- a/app/Jobs/SendAccountDeletedEmail.php +++ b/app/Jobs/SendAccountDeletedEmail.php @@ -2,9 +2,9 @@ namespace App\Jobs; +use App\Models\User; use App\Models\Settings; use App\Mail\AccountDeleted; -use App\Models\User; use Illuminate\Bus\Queueable; use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; diff --git a/app/Jobs/SendAccountExpiredEmail.php b/app/Jobs/SendAccountExpiredEmail.php index b0d1609b6..37f8cb2a8 100644 --- a/app/Jobs/SendAccountExpiredEmail.php +++ b/app/Jobs/SendAccountExpiredEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Mail\AccountExpired; use App\Models\User; +use App\Mail\AccountExpired; use Illuminate\Bus\Queueable; use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels; diff --git a/app/Jobs/SendPasswordResetEmail.php b/app/Jobs/SendPasswordResetEmail.php index 0683a6288..b918f87f7 100644 --- a/app/Jobs/SendPasswordResetEmail.php +++ b/app/Jobs/SendPasswordResetEmail.php @@ -2,8 +2,8 @@ namespace App\Jobs; -use App\Mail\PasswordReset; use App\Models\User; +use App\Mail\PasswordReset; use Illuminate\Bus\Queueable; use Illuminate\Support\Facades\Mail; use Illuminate\Queue\SerializesModels;