From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 17 May 2005 08:53:15 +0000 (+0000)
Subject: added Kolab tab
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a61e00f3bb30bacfa8490ac32e8e4890fd01aa16;p=gosa.git

added Kolab tab


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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 587d856f0..508f482ae 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -91,6 +91,7 @@
 		<tab class="servdns" name="DNS" />
 		<tab class="servdhcp" name="DHCP" />
 		<tab class="terminfo" name="Monitoring" />
+		{servKolab}
 		<tab class="reference" name="References" />
 	</servtabs>
 
@@ -133,7 +134,7 @@
 	</ogrouptabs>
 
 	<connectivity>
-		<tab class="kolabAccount" />
+		{kolabAccount}
 		<tab class="proxyAccount" />
 		<tab class="pureftpdAccount" />
 		<tab class="webdavAccount" />
diff --git a/html/setup.php b/html/setup.php
index 4517c23f8..754e0261b 100644
--- a/html/setup.php
+++ b/html/setup.php
@@ -47,7 +47,15 @@ if (!file_exists(CONFIG_TEMPLATE_DIR."/gosa.conf")){
 $_SESSION['errors']= "";
 
 // Print out gosa.conf 
-if ((isset($_SESSION['classes']) &&  isset($_SESSION['ldapconf']) && (isset($_POST['getconf']) || isset($_GET['getconfig']) ))){
+//if(isset($_SESSION['classes'])) print "\$_SESSION['classes']=ok";
+//if(isset($_SESSION['ldapconf'])) print "\$_SESSION['ldapconf']=ok";
+//if(isset($_POST['getconf']))  print "\$_POST['getconf']=ok";
+
+if ((
+    isset($_SESSION['classes']) &&  
+    isset($_SESSION['ldapconf']) && 
+      (
+      isset($_POST['getconf']) || isset($_GET['getconfig']) ))){
   echo parse_contrib_conf();
   exit;
 }
diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 84ce3d8c4..86d245cb3 100644
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -426,7 +426,7 @@ function parse_contrib_conf()
   $replacements['{SMBHASH}']                =   $pwdhash;
   $replacements['{GOVERNMENTMODE}']         =   "false"; 
   $replacements['{kolabAccount}']           =   "";
-
+  $replacements['{servKolab}']              =   "";
 
 
   // This array contains all preg_replace syntax to delete all unused plugins
@@ -479,6 +479,7 @@ function parse_contrib_conf()
     if($ldapconf['mail_methods'][$ldapconf['mail']]=="kolab")
       {
       $replacements['{kolabAccount}']  ="<tab class=\"kolabAccount\" />";
+      $replacements['{servKolab}']     ="<tab class=\"servkolab\" name=\"Kolab\" />";
       }