Fixed Setup, allow passwords with '" without breaking to setup ui.

[gosa.git] / gosa-core / contrib / gosa.conf

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 6f683d68ffbfd091230e24bf5309927795a59982..2539a72c60285bafcdff25df3e61b9eeb8dcd08a 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -1,6 +1,5 @@
 {literal}<?xml version="1.0"?>{/literal}
-<conf>
-       <config_version>{$get_gosa_version}</config_version>
+<conf config_version="{$config_checksum}" >
        <menu>
                <section name="My account">
                        <plugin acl="users/generic" class="user" />
@@ -33,7 +32,7 @@
                        <plugin acl="users" class="userManagement" icon="user.png" />
                        <plugin acl="groups" class="groupManagement" />
                        <plugin acl="sudo" class="sudoManagement" icon="sudo.png" />
-                       <plugin acl="ogroups" class="ogroupManagement" icon="ogroup.png" />
+                       <plugin acl="ogroups" class="ogroupManagement" />
                        <plugin acl="application" class="applicationManagement" icon="application.png" />
 {if $cv.enableMimeType}
                        <plugin acl="mimetypes" class="mimetypeManagement" icon="mimetypes.png" />
@@ -156,10 +155,10 @@
                <tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
                <tab class="faiSummaryTab" name="Deployment summary" />
-               <tab class="goto_log_view" name="Log view" />
+               <tab class="goto_log_view" name="Installation logs" />
 {else}
-<!--    <tab class="faiSummaryTab" name="Deployment summary" /> -->
-<!--   <tab class="goto_log_view" name="Log view" /> -->
+<!--  <tab class="faiSummaryTab" name="Deployment summary" /> -->
+<!--   <tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
                <tab class="terminfo" name="Information" 
                        snmpcommunity="{$cv.optional.snmpcommunity}" />
@@ -175,10 +174,10 @@
                        snmpcommunity="{$cv.optional.snmpcommunity}" />
 {if $cv.enableFAI_management}
                <tab class="faiSummaryTab" name="Deployment summary" />
-               <tab class="goto_log_view" name="Log view" />
+               <tab class="goto_log_view" name="Installation logs" />
 {else}
 <!--   <tab class="faiSummaryTab" name="Deployment summary" /> -->
-<!--   <tab class="goto_log_view" name="Log view" /> -->
+<!--   <tab class="goto_log_view" name="Installation logs" /> -->
 {/if}
                <tab class="glpiAccount" name="Inventory" />
        
@@ -236,6 +235,18 @@
                <tab class="department" name="Generic" />
        </deptabs>
 
+       <organization_tabs>
+               <tab class="organization" name="Generic" />
+       </organization_tabs>
+
+       <locality_tabs>
+               <tab class="locality" name="Generic" />
+       </locality_tabs>
+
+       <country_tabs>
+               <tab class="country" name="Generic" />
+       </country_tabs>
+
        <ogrouptabs>
                <tab class="ogroup" name="Generic" />
        </ogrouptabs>
@@ -249,11 +260,13 @@
                <tab class="webdavAccount" />
                <tab class="phpgwAccount" />
                <tab class="intranetAccount" />
+<!--
                <tab class="opengwAccount"
                        username="OGo"
                        password=""
                        database="OGo"
                        datahost="localhost" />
+-->
 <!--   
                <tab class="pptpAccount" /> 
                <tab class="phpscheduleitAccount" /> 
@@ -439,6 +452,7 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+                       logging="{$cv.generic_settings.logging}"
 {if $cv.optional.sudoou_active}
                        sudoou="{$cv.optional.sudoou}"
 {/if}