Updated setup, added gotomime type to configuration steps.

Unified contrib/gosa.conf indentation.

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index dbf2b849b077906e7f2fb980bfed86de8aa43b47..a7a4f2637c32e5c7ec0ceffd7adbe42d417c6a1a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -31,12 +31,12 @@
                        <plugin acl="default" class="phoneAccount" icon="phone.png"
                                path="plugins/gofon/phoneaccount" />
 <!--
-            <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
-                path="plugins/personal/nagios" />
+                       <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
+                               path="plugins/personal/nagios" />
 -->
 <!-- 
-            <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
-                path="plugins/personal/nagios" /> 
+                       <plugin acl="default" class="nagiosAccount" icon="monitoring.png"
+                               path="plugins/personal/nagios" /> 
 -->
                        <plugin acl="default" class="password" icon="password.png"
                                path="plugins/personal/password" />
@@ -55,12 +55,18 @@
                                icon="application.png" path="plugins/admin/applications" />
                        <plugin acl="systems" class="systems" icon="system.png"
                                path="plugins/admin/systems" />
+{if $cv.enableMimeType}
                        <plugin acl="mimetype" class="mimetypeManagement"
                                icon="mimetypes.png" path="plugins/admin/mimetypes" />
-
+{else}
+<!--
+                       <plugin acl="mimetype" class="mimetypeManagement"
+                               icon="mimetypes.png" path="plugins/admin/mimetypes" />
+-->
+{/if}
                        <!-- Use 'lock_dn'      for dn
-                     'lock_name'    for name
-                     'lock_type'    for branch/freeze -->
+                               'lock_name'    for name
+                               'lock_type'    for branch/freeze -->
 
 {if $cv.enableFAI_management}
                        <plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
@@ -77,8 +83,8 @@
                                path="plugins/gofon/macro" />
                        <plugin acl="conference" class="phoneConferenceManagment" icon="conference.png"
                                path="plugins/gofon/conference" />
-            <plugin acl="acl" class="acl" icon="acl.png"
-                path="plugins/admin/acl" />
+                       <plugin acl="acl" class="acl" icon="acl.png"
+                               path="plugins/admin/acl" />
                </section>
 
                <section name="Addons">
@@ -110,9 +116,9 @@
                </section>
        </menu>
 
-    <aclroletab>
-        <tab class="aclRole" name="ACL Role" />
-    </aclroletab>
+       <aclroletab>
+               <tab class="aclRole" name="ACL Role" />
+       </aclroletab>
 
        <usertabs>
                <tab class="user" name="Generic" />
@@ -131,7 +137,7 @@
                <tab class="gofaxAccount" name="Fax" />
                <tab class="phoneAccount" name="Phone" />
 <!--
-        <tab class="scalixAccount" name="Scalix" />
+               <tab class="scalixAccount" name="Scalix" />
 -->
 <!--            
                <tab class="nagiosAccount" name="Nagios" /> 
@@ -214,52 +220,52 @@
                <tab class="glpiPrinterAccount" name="Inventory" />
        </printtabs>
 
-    <phonetabs>
-        <tab class="phonegeneric" name="Generic" />
+       <phonetabs>
+               <tab class="phonegeneric" name="Generic" />
                <tab class="glpiAccount" name="Inventory" />
-    </phonetabs>
+       </phonetabs>
 
-    <componenttabs>
-       <tab class="componentgeneric" name="Generic" />
+       <componenttabs>
+               <tab class="componentgeneric" name="Generic" />
                <tab class="glpiAccount" name="Inventory" />
-    </componenttabs>
+       </componenttabs>
 
-    <wintabs>
-       <tab class="wingeneric" name="Generic" />
+       <wintabs>
+               <tab class="wingeneric" name="Generic" />
                <tab class="glpiAccount" name="Inventory" />
-    </wintabs>
+       </wintabs>
 
        <serverservice>
-        <tab class="goMailServer" />
+               <tab class="goMailServer" />
 {if $cv.mail == "kolab"}
                <tab class="servkolab" />
 {/if}
-        <tab class="goNtpServer" />
+               <tab class="goNtpServer" />
                <tab class="servrepository" />
-        <tab class="goImapServer" />
-        <tab class="goKrbServer" />
-        <tab class="goFaxServer" />
-        <tab class="goFonServer" />
-        <tab class="goLogDBServer" />
-        <tab class="goGlpiServer" />
-        <tab class="goCupsServer" />
-        <tab class="goSyslogServer" />
-        <tab class="goTerminalServer" />
-        <tab class="goLdapServer" />
-        <tab class="goShareServer" />
-        <tab class="servdns" />
-        <tab class="gosaLogServer" />
-    </serverservice>
-
-    <deptabs>
-       <tab class="department" name="Generic" />
-    </deptabs>
-
-    <ogrouptabs>
-       <tab class="ogroup" name="Generic" />
-    </ogrouptabs>
-
-    <connectivity>
+               <tab class="goImapServer" />
+               <tab class="goKrbServer" />
+               <tab class="goFaxServer" />
+               <tab class="goFonServer" />
+               <tab class="goLogDBServer" />
+               <tab class="goGlpiServer" />
+               <tab class="goCupsServer" />
+               <tab class="goSyslogServer" />
+               <tab class="goTerminalServer" />
+               <tab class="goLdapServer" />
+               <tab class="goShareServer" />
+               <tab class="servdns" />
+               <tab class="gosaLogServer" />
+       </serverservice>
+
+       <deptabs>
+               <tab class="department" name="Generic" />
+       </deptabs>
+
+       <ogrouptabs>
+               <tab class="ogroup" name="Generic" />
+       </ogrouptabs>
+
+       <connectivity>
 {if $cv.mail == "kolab"}
                <tab class='kolabAccount' /> 
 {/if}
@@ -269,10 +275,10 @@
                <tab class="phpgwAccount" />
                <tab class="intranetAccount" />
                <tab class="opengwAccount"
-             username="OGo"
-             password=""
-             database="OGo"
-             datahost="localhost" />
+                       username="OGo"
+                       password=""
+                       database="OGo"
+                       datahost="localhost" />
 <!--   
                <tab class="pptpAccount" /> 
                <tab class="phpscheduleitAccount" /> 

diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc
index 553bdef897dd05cc3c310e2162e882864fd6f6e2..e6b96b10cd333da4261ba4a26cda2fd7828709d3 100644 (file)
--- a/setup/class_setupStep_Config2.inc
+++ b/setup/class_setupStep_Config2.inc
@@ -52,11 +52,12 @@ class Step_Config2 extends setup_step
   var $sambaDomain_found    = FALSE;
   var $use_netatalk         = FALSE;
   var $enableFAI_management = FALSE;
+  var $enableMimeType       = FALSE;
 
   var $timezone       = "Europe/Berlin";
   var $timezones      = array();
 
-  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone");
+  var $attributes = array("governmentmode","sambaidmapping","cyrusunixstyle","mail","use_netatalk","enableFAI_management","timezone","enableMimeType");
   var $called = FALSE;
 
   function Step_Config2()
@@ -124,6 +125,11 @@ class Step_Config2 extends setup_step
 #        $this->enableFAI_management = TRUE;
       }
 
+      /* Check the MimeType schema is used */
+      if(is_array($tmp) && isset($tmp['gotoMimeType'])){
+        $this->enableMimeType = TRUE;
+      }
+
       if(is_array($tmp) && isset($tmp['dhcpClass'])){
         $this->generic_settings['enableDHCP'] = TRUE;
       }

diff --git a/setup/setup_config2.tpl b/setup/setup_config2.tpl
index e216ddcdcd369d1d3d1e3d40d8e864af3b774d58..1d14f3d5cea0c49116126ee6a46ce73b3a21c682 100644 (file)
--- a/setup/setup_config2.tpl
+++ b/setup/setup_config2.tpl
@@ -122,6 +122,18 @@
         </div>
     </div>
 
+       <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Enable mime type management{/t}
+        </div>
+        <div class='step4_value'>
+
+            <select name="enableMimeType" size="1" title="">
+                {html_options options=$bool selected=$enableMimeType}
+            </select>
+        </div>
+    </div>
+
        <div class='step4_container'>
         <div class='step4_name'>
             {t}Enable FAI release management{/t}