mirror of
https://github.com/NNTmux/newznab-tmux.git
synced 2026-08-29 01:08:56 +00:00
Fix error on email change in user profile. Closes #1049
This commit is contained in:
@@ -1,3 +1,5 @@
|
||||
2019-12-26 DariusIII
|
||||
* Fix: Fix error on email change in user profile
|
||||
2019-12-18 DariusIII
|
||||
* Chg: Check if $release['cleanname'] is set
|
||||
2019-12-15 DariusIII
|
||||
|
||||
@@ -131,6 +131,6 @@ class LoginController extends Controller
|
||||
$request->session()->flush();
|
||||
$request->session()->regenerate();
|
||||
|
||||
return redirect('/login')->with('info', 'You have been logged out successfully');
|
||||
return redirect('login')->with('info', 'You have been logged out successfully');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Http\Controllers\Auth\LoginController;
|
||||
use App\Jobs\SendAccountDeletedEmail;
|
||||
use App\Models\ReleaseComment;
|
||||
use App\Models\Settings;
|
||||
@@ -11,6 +12,7 @@ use App\Models\UserRequest;
|
||||
use Blacklight\NZBGet;
|
||||
use Blacklight\SABnzbd;
|
||||
use Blacklight\utility\Utility;
|
||||
use Illuminate\Auth\Events\Login;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
@@ -117,7 +119,7 @@ class ProfileController extends BasePageController
|
||||
/**
|
||||
* @param \Illuminate\Http\Request $request
|
||||
*
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
|
||||
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|void
|
||||
* @throws \Exception
|
||||
*/
|
||||
public function edit(Request $request)
|
||||
@@ -265,12 +267,20 @@ class ProfileController extends BasePageController
|
||||
User::updatePassword($userid, $request->input('password'));
|
||||
}
|
||||
|
||||
if (! empty($request->input('email')) && $this->userdata->email !== $request->input('email')) {
|
||||
$this->userdata->email = $request->input('email');
|
||||
if (! $this->userdata->hasRole('Admin')) {
|
||||
if (!empty($request->input('email')) && $this->userdata->email !== $request->input('email')) {
|
||||
$this->userdata->email = $request->input('email');
|
||||
|
||||
UserVerification::generate($this->userdata);
|
||||
$verify_user = User::find(Auth::id());
|
||||
|
||||
UserVerification::send($this->userdata, 'User email verification required');
|
||||
UserVerification::generate($verify_user);
|
||||
|
||||
UserVerification::send($verify_user, 'User email verification required');
|
||||
|
||||
Auth::logout();
|
||||
|
||||
return redirect('login')->with('info', 'You will be able to login after you verify your new email address');
|
||||
}
|
||||
}
|
||||
|
||||
return redirect('profile')->with('success', 'Profile changes saved');
|
||||
|
||||
Reference in New Issue
Block a user