linuxserver/Heimdall
1
0
Fork 0
mirror of https://github.com/linuxserver/Heimdall.git synced 2026-02-21 20:20:34 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Get settings working and autologin

Browse Source
This commit is contained in:
Kode
2018-10-15 19:56:45 +01:00
parent aa351e31bf
commit d0293c785b
15 changed files with 204 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Auth/LoginController.php
View File

@@ -93,7 +93,10 @@ class LoginController extends Controller
public function autologin($uuid)
{
$user = User::where('autologin', $uuid)->first();
Auth::login($user);
session(['current_user' => $user]);
return redirect()->route('dash');
}
/**

5
app/Http/Controllers/SettingsController.php
View File

@@ -103,10 +103,11 @@ class SettingsController extends Controller
*/
public function clear($id)
{
$user = $this->user();
$setting = Setting::find($id);
if((bool)$setting->system !== true) {
$setting->value = '';
$setting->save();
$user->settings()->detach($setting->id);
$user->settings()->save($setting, ['uservalue' => '']);
}
$route = route('settings.index', [], false);
return redirect($route)

25
app/Providers/AppServiceProvider.php
View File

@@ -7,7 +7,6 @@ use Artisan;
use Schema;
use App\Setting;
use App\User;
use Session;
class AppServiceProvider extends ServiceProvider
{
@@ -18,7 +17,7 @@ class AppServiceProvider extends ServiceProvider
*/
public function boot()
{
$alt_bg = '';
if(!is_file(base_path('.env'))) {
touch(base_path('.env'));
@@ -34,11 +33,6 @@ class AppServiceProvider extends ServiceProvider
}
if(is_file(database_path('app.sqlite'))) {
if(Schema::hasTable('settings')) {
die("s: ".\Session::get('current_user'));
//die("c: ".User::currentUser());
if($bg_image = Setting::_fetch('background_image', User::currentUser())) {
$alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
}
// check version to see if an upgrade is needed
$db_version = Setting::_fetch('version');
@@ -49,16 +43,25 @@ class AppServiceProvider extends ServiceProvider
} else {
Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
}
$lang = Setting::fetch('language');
\App::setLocale($lang);
}
if(!is_file(public_path('storage'))) {
Artisan::call('storage:link');
}
view()->share('alt_bg', $alt_bg);
//var_dump(env('FORCE_HTTPS'));
// User specific settings need to go here as session isn't available at this point in the app
view()->composer('*', function ($view)
{
$alt_bg = '';
if($bg_image = Setting::fetch('background_image')) {
$alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
}
$lang = Setting::fetch('language');
\App::setLocale($lang);
$view->with('alt_bg', $alt_bg );
});
if (env('FORCE_HTTPS') === true) {
\URL::forceScheme('https');