DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #13821 from snipe/bug/rb-17462

Browse source 
More graceful failure if ldap_results JSON decode isn’t set
This commit is contained in:
snipe 2023-10-31 17:11:14 +00:00 committed by GitHub
parent e381bf978f f822f8b186
commit 5073c3389f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Users/LDAPImportController.php
View file

@ -56,6 +56,10 @@ class LDAPImportController extends Controller
$ldap_results_json = Artisan::output(); $ldap_results_json = Artisan::output();
$ldap_results = json_decode($ldap_results_json, true); $ldap_results = json_decode($ldap_results_json, true);
if (!$ldap_results) {
return redirect()->back()->withInput()->with('error', trans('general.no_results'));
}
// Direct user to appropriate status page. // Direct user to appropriate status page.
if ($ldap_results['error']) { if ($ldap_results['error']) {
return redirect()->back()->withInput()->with('error', $ldap_results['error_message']); return redirect()->back()->withInput()->with('error', $ldap_results['error_message']);