Fixes #5004 Optional schema check failure should not block login

cc3d0408 · Côme Chilliet · 9f749a79 · cc3d0408
Commit cc3d0408 authored 8 years ago by Côme Chilliet
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 2 deletions
+6 -2
--- a/html/index.php
+++ b/html/index.php
@@ -248,8 +248,12 @@ class Index {
    $cfg['tls']         = ($config->get_cfg_value('ldapTLS') == 'TRUE');
    $str = check_schema($cfg);
    foreach ($str as $tr) {
-      if (isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) {
-        return _('LDAP schema check reported errors:').'<br/><br/><i>'.$tr['MSG'].'</i>';
+      if (!$tr['STATUS']) {
+        if ($tr['IS_MUST_HAVE']) {
+          return _('LDAP schema check reported errors:').'<br/><br/><i>'.$tr['MSG'].'</i>';
+        } else {
+          msg_dialog::display(_('LDAP schema error'), $tr['MSG'], WARNING_DIALOG);
+        }
      }
    }
    return TRUE;