Fixed undefined index, in index

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

diff --git a/html/index.php b/html/index.php
index 7df5f64f817828dfc4f55749fb25f8c5371ca532..1adcf42ff6d6ed1f65fde5541d1da1bcce127f30 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -149,7 +149,7 @@ 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'])){

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 39f8d3eafdcc246969b9a7f78685c9af25bd008a..0b60276398880edf4a9b4f6bc33828aaeaa7f08e 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -56,7 +56,7 @@ function is_schema_readable($server, $admin, $password)
   return(true);
 } 
 
-function schema_check($server, $admin, $password, $aff=0)
+function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false)
 {
   global $config;
 
@@ -227,9 +227,8 @@ function schema_check($server, $admin, $password, $aff=0)
     $affich['phoneaccount']['status']= true;
   }
 
-  if(($_SESSION['ldapconf']['mail_methods'][$_SESSION['ldapconf']['mail']] == "kolab")){
-    if(!isset($objectclasses['kolabInetOrgPerson']))
-    {
+  if(($_SESSION['ldapconf']['mail_methods'][$_SESSION['ldapconf']['mail']] == "kolab")&&(!$CalledByIndexPhP)){
+    if(!isset($objectclasses['kolabInetOrgPerson']))  {
       $messages['kolab']['msg']= _("Support for Kolab disabled, no schema seems to be installed, setting mail-method to cyrus");
       $affich['kolab']['msg']=$messages['kolab']['msg']."<td class=\"check\">kolab2.schema</td>";