Allowed - un givenName and sn

[gosa.git] / html / index.php

diff --git a/html/index.php b/html/index.php
index 1aac30891708b74512a1f880c3cf0802f42e1b93..1adcf42ff6d6ed1f65fde5541d1da1bcce127f30 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -120,7 +120,7 @@ if (!isset($HTTP_SERVER_VARS['HTTPS']) ||
 }
 
 /* If SSL is forced, just forward to the SSL enabled site */
-if ($config->data['MAIN']['FORCESSL'] == 'true'){
+if ($config->data['MAIN']['FORCESSL'] == 'true' && $ssl != ''){
   header ("Location: $ssl");
   exit;
 }
@@ -149,11 +149,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
     echo $_SESSION['errors'];
     exit();
   }else{
-    $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD']));
+    $str = (schema_check($config->current['SERVER'],$config->current['ADMIN'],$config->current['PASSWORD'],0,TRUE));
     $checkarr = array();
     foreach($str as $tr){
       if(isset($tr['needonstartup'])){
-        print_red(_("Your ldap setup contains old schema definitions. Please re-run the setup."));
+        print_red($tr['msg']."<br>"._("Your ldap setup contains old schema definitions. Please re-run the setup."));
         print $_SESSION['errors'];
         exit();
       }