From 187206cb88b1ec8ab7e587b1ecfe4360f722f424 Mon Sep 17 00:00:00 2001 From: Sxderp Date: Tue, 15 Jan 2019 16:59:36 -0500 Subject: [PATCH] Fix saving of REMOTE_USER setting broken by 1a64879b6 (#6565) The previous commit made it such that remote user login could only be enabled if two factor authentication was also enabled. Unnest the configuration so that the setting can be applied without. --- app/Http/Controllers/SettingsController.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 7034186cc..1859d8e4a 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -482,13 +482,12 @@ class SettingsController extends Controller $setting->two_factor_enabled = null; } else { $setting->two_factor_enabled = $request->input('two_factor_enabled'); - - # remote user login - $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled'); - $setting->login_common_disabled= (int)$request->input('login_common_disabled'); - $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url'); } + # remote user login + $setting->login_remote_user_enabled = (int)$request->input('login_remote_user_enabled'); + $setting->login_common_disabled = (int)$request->input('login_common_disabled'); + $setting->login_remote_user_custom_logout_url = $request->input('login_remote_user_custom_logout_url'); } $setting->pwd_secure_uncommon = (int) $request->input('pwd_secure_uncommon');