Removed unnessesary searches

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

diff --git a/html/index.php b/html/index.php
index 33a89c3391250244ac0f66d2d99cf371582d5530..1aac30891708b74512a1f880c3cf0802f42e1b93 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -142,27 +142,24 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
     exit();
   }
 
-  $ldap->search("(objectClass=*)",array("subschemaSubentry"));
-  $attrs= $ldap->fetch();
-  if(!count($attrs)){
+  /* Check for schema file presence */
+  require_once("functions_setup.inc");
+  if(!is_schema_readable($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'])){
     print_red(_("GOsa cannot retrieve information about the installed schema files. Please make sure, that this is possible."));
     echo $_SESSION['errors'];
     exit();
   }else{
-    require_once("functions_setup.inc");
     $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD']));
     $checkarr = array();
     foreach($str as $tr){
       if(isset($tr['needonstartup'])){
-//        print_red($tr['msg']);
-        print_red(_("Your Schema files are not at actual version, please move your gosa.conf and  run Setup again, to check this."));
+        print_red(_("Your ldap setup contains old schema definitions. Please re-run the setup."));
         print $_SESSION['errors'];
         exit();
       }
     }
   }
 
-
   /* Check for locking area */
   $ldap->cat($config->current['CONFIG']);
   $attrs= $ldap->fetch();