SBDevelopment/ThemeParkPlus-Panel
Archived
3
0
Fork 0
Code Activity

Lot's of bug fixes

Browse source
This commit is contained in:
BuildTools 2021-06-27 21:01:43 +02:00
parent ad320963fc
commit 7718ed6c32
196 changed files with 51167 additions and 3010 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/Http/Controllers/Profile/ChangeController.php
View file

@ -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');
}
}

6
app/Http/Controllers/Profile/SecurityController.php
View file

@ -36,7 +36,7 @@ class SecurityController extends Controller
$pages = Session::where('user_id', Auth::id())->count();
$pages = (int) ceil($pages/10);
if($page > $pages)
return redirect()->route('profile.security', ['page' => $pages]);
return redirect()->route('security', ['page' => $pages]);
$sessions = Session::where('user_id', Auth::id())->where('id', '!=', session()->getId())->skip(($page - 1)*10)->take(($page != 1 ? 10 : 9))->orderBy('last_activity', 'desc')->get();
$array = ['TFA' => $tfa, 'pages' => $pages, 'page' => $page, 'sessions' => $sessions, 'agent' => new Agent()];
@ -67,10 +67,10 @@ class SecurityController extends Controller
public function session($id)
{
if(session()->getId() === $id)
return redirect()->route('profile.security');
return redirect()->route('security');
Session::where(['id' => $id, 'user_id' => Auth::id()])->forceDelete();
return redirect()->route('profile.security');
return redirect()->route('security');
}
}