linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2025-11-01 21:47:54 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update to laravel 5.7 and try getting autologin saved

Browse Source
This commit is contained in:
Kode
2018-10-14 20:50:32 +01:00
parent c3da17befc
commit 6501aacb1b
2402 changed files with 79064 additions and 28971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app/Http/Controllers/UserController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\User;
use Illuminate\Support\Str;
class UserController extends Controller
{
@@ -38,7 +39,32 @@ class UserController extends Controller
*/
public function store(Request $request)
{
//
$validatedData = $request->validate([
'name' => 'required|max:255',
'email' => 'required|email',
'password' => 'nullable',
'password_confirmation' => 'nullable|confirmed'
]);
//die(print_r($request->all()));
if($request->hasFile('file')) {
$path = $request->file('file')->store('avatars');
$request->merge([
'avatar' => $path
]);
}
if ((bool)$request->input('autologin_allow') === true) {
$request->merge([
'autologin' => (string)Str::uuid()
]);
}
$user = User::create($request->all());
$route = route('dash', [], false);
return redirect($route)
->with('success',__('app.alert.success.user_updated'));
}
/**
@@ -58,9 +84,11 @@ class UserController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
public function edit(User $user)
{
//
$data['user'] = $user;
return view('users.edit', $data);
}
/**
@@ -70,9 +98,38 @@ class UserController extends Controller
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
public function update(Request $request, User $user)
{
//
$validatedData = $request->validate([
'name' => 'required|max:255',
'email' => 'required|email',
'password' => 'nullable',
'password_confirmation' => 'nullable|confirmed'
]);
//die(print_r($request->all()));
if($request->hasFile('file')) {
$path = $request->file('file')->store('avatars');
$request->merge([
'avatar' => $path
]);
}
if ((bool)$request->input('autologin_allow') === true) {
$autologin = (is_null($user->autologin)) ? (string)Str::uuid() : $user->autologin;
} else {
$autologin = null;
}
$request->merge([
'autologin' => $autologin
]);
$input = $request->except(['password_confirmation', 'autologin_allow']);
//die(print_r($input));
$user->update($input);
$route = route('dash', [], false);
return redirect($route)
->with('success',__('app.alert.success.user_updated'));
}
/**