mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-06 02:05:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop

Browse Source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Requests/SettingsSamlRequest.php
This commit is contained in:
snipe
2021-04-14 15:15:07 -07:00
parent 252b2ee1b4 4f5374b2e8
commit e1c6d4ced7
5 changed files with 109 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -998,6 +998,11 @@ class SettingsController extends Controller
$setting->saml_sp_x509cert = $request->input('saml_sp_x509cert');
$setting->saml_sp_privatekey = $request->input('saml_sp_privatekey');
}
if (!empty($request->input('saml_sp_x509certNew'))) {
$setting->saml_sp_x509certNew = $request->input('saml_sp_x509certNew');
} else {
$setting->saml_sp_x509certNew = "";
}
$setting->saml_custom_settings = $request->input('saml_custom_settings');
if ($setting->save()) {
@ -1226,4 +1231,4 @@ class SettingsController extends Controller
{
return view('settings.logins');
}
}
}