mirror of
https://github.com/snipe/snipe-it.git
synced 2025-02-21 03:15:45 -08:00
More graceful failure if ldap_results JSON decode isn’t set
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
e381bf978f
commit
f822f8b186
|
@ -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']);
|
||||||
|
|
Loading…
Reference in a new issue