Lot's of bug fixes
This commit is contained in:
parent
ad320963fc
commit
7718ed6c32
196 changed files with 51167 additions and 3010 deletions
|
@ -4,6 +4,7 @@ namespace App\Http\Controllers\Profile;
|
|||
|
||||
use App\ChangeEmail;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Mail\EmailChange;
|
||||
use App\Notifications\SendMailChange;
|
||||
use Illuminate\Support\Facades\Mail;
|
||||
use Illuminate\Support\Facades\Validator;
|
||||
|
@ -84,7 +85,7 @@ class ChangeController extends Controller
|
|||
'token' => Str::random(12)
|
||||
]);
|
||||
|
||||
Mail::to($user)->send(new SendMailChange($change));
|
||||
Mail::to($user->email)->send(new EmailChange($change));
|
||||
session()->flash('email_success', 'Successfully requested email change');
|
||||
return Redirect::back();
|
||||
}
|
||||
|
@ -92,7 +93,7 @@ class ChangeController extends Controller
|
|||
public function verifyEmail($id, $token, $email) {
|
||||
if(Auth::id() != $id) {
|
||||
session()->flash('email_error', 'Incorrect email change request: '.$email);
|
||||
return Redirect::route('panel.change');
|
||||
return Redirect::route('change');
|
||||
}
|
||||
|
||||
$user = Auth::user();
|
||||
|
@ -104,14 +105,14 @@ class ChangeController extends Controller
|
|||
|
||||
if(empty($model)) {
|
||||
session()->flash('email_error', 'Unable to change email address to: '.$email);
|
||||
return Redirect::route('panel.change');
|
||||
return Redirect::route('change');
|
||||
}
|
||||
|
||||
$user->email = $email;
|
||||
$user->save();
|
||||
$model->delete();
|
||||
session()->flash('email_success', 'Successfully changed email address to: '.$email);
|
||||
return Redirect::route('panel.change');
|
||||
return Redirect::route('change');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Reference in a new issue