From 67dc1055e897d60a71616462b3a1e696d04be32f Mon Sep 17 00:00:00 2001 From: hickert Date: Tue, 17 May 2005 06:48:58 +0000 Subject: [PATCH] kolab tab removed if unused git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@220 594d385d-05f5-0310-b6e9-bd551577e9d8 --- include/setup_checks.inc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/include/setup_checks.inc b/include/setup_checks.inc index 58a0728dc..84ce3d8c4 100644 --- a/include/setup_checks.inc +++ b/include/setup_checks.inc @@ -425,7 +425,7 @@ function parse_contrib_conf() $replacements['{MAILMETHOD}'] = $ldapconf['mail_methods'][$ldapconf['mail']]; $replacements['{SMBHASH}'] = $pwdhash; $replacements['{GOVERNMENTMODE}'] = "false"; - + $replacements['{kolabAccount}'] = ""; @@ -475,6 +475,16 @@ function parse_contrib_conf() } + + if($ldapconf['mail_methods'][$ldapconf['mail']]=="kolab") + { + $replacements['{kolabAccount}'] =""; + } + + + + + // Lets check which samba version we will use // in case of samba 2 we don't need to add additional objets in gosa.conf @@ -546,7 +556,7 @@ function parse_contrib_conf() }// else --> !$fp=fopen("../contrib/gosa.conf","r") - return ( $str); + return ((($str))); } -- 2.30.2