From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 May 2010 11:44:59 +0000 (+0000)
Subject: Removed old style schema check
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e2376a7a35ab68c58d79ce9e394193a05dc45cb4;p=gosa.git

Removed old style schema check



git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18683 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/index.php b/gosa-core/html/index.php
index 06fb9d3b7..f8a84e876 100644
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
@@ -273,33 +273,6 @@ if (($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])) || $htacces
         exit();
     }
 
-    /* Check for schema file presence */
-    if ($config->get_cfg_value("core","schemaCheck") == "true") {
-        $recursive = ($config->get_cfg_value("core","ldapFollowReferrals") == "true");
-        $tls =       ($config->get_cfg_value("core","ldapTLS") == "true");
-
-        if(!count($ldap->get_objectclasses())) {
-            msg_dialog::display(_("LDAP error"), _("Cannot obtain information about the available LDAP schema!"), ERROR_DIALOG);
-            displayLogin();
-            exit()  ;
-        }else{
-            $cfg = array();
-            $cfg['admin']     = $config->current['ADMINDN'];
-            $cfg['password']  = $config->current['ADMINPASSWORD'];
-            $cfg['connection']= $config->current['SERVER'];
-            $cfg['tls']       = $tls;
-            $str = check_schema($cfg, $config->get_cfg_value("core","rfc2307bis") == "true");
-            $checkarr = array();
-            foreach($str as $tr) {
-                if(isset($tr['IS_MUST_HAVE']) && !$tr['STATUS']) {
-                    msg_dialog::display(_("LDAP error"), _("Your LDAP setup contains old schema definitions:")."<br><br>".$tr['MSG'], ERROR_DIALOG);
-                    displayLogin();
-                    exit();
-                }
-            }
-        }
-    }
-
     /* Check for locking area */
     $ldap->cat($config->get_cfg_value("core","config"), array("dn"));
     $attrs= $ldap->fetch();
diff --git a/gosa-core/include/class_ldap.inc b/gosa-core/include/class_ldap.inc
index 21fc08930..ba2dafe6d 100644
--- a/gosa-core/include/class_ldap.inc
+++ b/gosa-core/include/class_ldap.inc
@@ -1204,13 +1204,6 @@ class LDAP{
     $objectclasses = array();
     global $config;
 
-    /* Only read schema if it is allowed */
-    if(isset($config) && preg_match("/config/i",get_class($config))){
-      if ($config->get_cfg_value("core","schemaCheck") != "true"){
-        return($objectclasses);
-      } 
-    }
-
     /* Return the cached results. */
     if(class_available('session') && session::global_is_set("LDAP_CACHE::get_objectclasses") && !$force_reload){
       $objectclasses = session::global_get("LDAP_CACHE::get_objectclasses");