From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 26 Apr 2006 09:41:44 +0000 (+0000)
Subject: Reverted from last patch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6b499718db0b7ef86e39897e44c8541f543b2c47;p=gosa.git

Reverted from last patch


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

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 570c3ec2c..d800479f5 100644
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -250,20 +250,20 @@ function schema_check($server, $admin, $password, $aff=0,$CalledByIndexPhP=false
   /* Fix for PHP Fehler "Undefined index: ldapconf"
    * Ablaufverfolgung[1]: Funktion schema_check	Datei: /home/hickert/gosa/include/functions_setup.inc (Zeile 230)
    */
-  if(isset($_SESSION['ldapconf']['mail_methods'])){
-    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>";
-        $tmp= array_flip($_SESSION['ldapconf']['mail_methods']);
-        $_SESSION['ldapconf']['mail']=$tmp['cyrus'];
-        $messages['kolab']['status']= FALSE;
-        $affich['kolab']['status']= FALSE;
-      }else{
-        $affich['kolab']['msg']=_("Support for Kolab enabled")."<td class=\"check\">gofon.schema</td>";
-        $affich['kolab']['status']= TRUE;
-      }
-    }
+  if((isset($_SESSION['ldapconf']['mail_methods']))&&(isset($_SESSION['ldapconf']))){
+	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>";
+	    $tmp= array_flip($_SESSION['ldapconf']['mail_methods']);
+	    $_SESSION['ldapconf']['mail']=$tmp['cyrus'];
+	    $messages['kolab']['status']= FALSE;
+	    $affich['kolab']['status']= FALSE;
+	  }else{
+	    $affich['kolab']['msg']=_("Support for Kolab enabled")."<td class=\"check\">gofon.schema</td>";
+	    $affich['kolab']['status']= TRUE;
+	  }
+	}
   }
   if($aff==0){
     return ($messages);