From 716d52561dd208aa169328a48edc527e56ed3081 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 7 Jul 2005 05:23:36 +0000
Subject: [PATCH] Fixed undefined index, in index

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@927 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/index.php              | 2 +-
 include/functions_setup.inc | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/html/index.php b/html/index.php
index 7df5f64f8..1adcf42ff 100644
--- 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 39f8d3eaf..0b6027639 100644
--- 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>";
 
-- 
2.30.2