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 587d856f013e05c83ec9cb363c3be108d788f3c7..508f482ae20e65d58ac2bb9c302b453d082eafc9 100644 (file)
--- 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 4517c23f8a6cb67c3a7bcf99830a45c6b274e06b..754e0261b5e6d8b00b289c6fe35e7c620e516ce2 100644 (file)
--- 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 84ce3d8c4baf01773457a589767fb1b51584a49a..86d245cb38c39f281cd187ef1425987252cd21d1 100644 (file)
--- 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\" />";
       }