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

48
app/Http/Controllers/Panel/UMSController.php
View file

@ -3,7 +3,7 @@ namespace App\Http\Controllers\Panel;
use App\ChangeEmail;
use App\Http\Controllers\Controller;
use App\Notifications\SendMailChange;
use App\Mail\EmailChange;
use App\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@ -33,7 +33,7 @@ class UMSController extends Controller
public function index($page = 1)
{
$pages = User::count();
$pages = (int) ceil($pages/25);
$pages = (int) ceil($pages/10);
if($pages < 1 && $page == 1)
$page = 1;
@ -42,7 +42,7 @@ class UMSController extends Controller
'page' => ($pages > 0 ? $pages : 1)
]);
$data = User::select('id', 'uuid', 'last_active', 'is_admin', 'is_root')->get();
$data = User::select('id', 'uuid', 'last_active', 'is_admin', 'is_root', 'email_verified_at')->get();
return view('panel.ums.index')->with([
'users' => $data,
'page' => $page,
@ -62,6 +62,7 @@ class UMSController extends Controller
if(!$user->is_root && !$user->is_admin)
return Redirect::route('panel.ums');
$user = User::findOrFail($id);
return view('panel.ums.edit')->with([
'user' => $user
]);
@ -86,27 +87,50 @@ class UMSController extends Controller
'token' => Str::random(12)
]);
Mail::to($user)->send(new SendMailChange($change));
Mail::to($request->get('email'))->send(new EmailChange($change));
die('Send! Email: '.$request->get('email'));
}
$validator = Validator::make($request->all(), [
'verified' => ['required', 'boolean']
]);
if(!$validator->passes())
return Redirect::back()->withErrors($validator);
if($request->get('verified')) {
$user->email_verified_at = empty($user->email_verified_at) ? date('Y-m-d H:i:s') : $user->email_verified_at;
} else {
$user->email_verified_at = null;
}
if(Auth::user()->is_root) {
$validator = Validator::make($request->all(), [
'is_admin' => ['required', 'boolean'],
'is_root' => ['required', 'boolean']
'admin' => ['required', 'numeric', 'min:0', 'max:2'],
]);
if(!$validator->passes())
if (!$validator->passes())
return Redirect::back()->withErrors($validator);
$user->is_admin = $request->get('is_admin');
$user->is_root = $request->get('is_root');
if($user->save()) {
session()->flash('success', 'Successfully edited user: '.$user->uuid);
$admin = $request->get('admin');
if ($admin == 1) {
$user->is_admin = 1;
$user->is_root = 0;
} else if($admin == 2) {
$user->is_admin = 0;
$user->is_root = 1;
} else {
session()->flash('error', 'Unable to edit user: '.$user->uuid);
$user->is_admin = 0;
$user->is_root = 0;
}
}
if($user->save()) {
session()->flash('success', 'Successfully edited user: '.$user->username());
} else {
session()->flash('error', 'Unable to edit user: '.$user->username());
}
return Redirect::route('panel.ums');
}