X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fgosa.conf;h=36cfae92e629891a073dc27e789e5eb24e6c8b68;hb=10b389ce61e35c2321db72a41678d0950677fd2f;hp=a7a4f2637c32e5c7ec0ceffd7adbe42d417c6a1a;hpb=e5fba680d28e33225d5acc5defdf4c550c991b84;p=gosa.git

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index a7a4f2637..36cfae92e 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -2,21 +2,21 @@
 <conf>
 	<menu>
 		<section name="My account">
-			<plugin acl="default" class="user" icon="personal.png"
+			<plugin acl="users/generic" class="user" icon="personal.png"
 				path="plugins/personal/generic" />
-			<plugin acl="default" class="posixAccount" icon="posix.png"
+			<plugin acl="users/posixAccount" class="posixAccount" icon="posix.png"
 				path="plugins/personal/posix" />
-			<plugin acl="default" class="environment" icon="env.png"
+			<plugin acl="users/environment" class="environment" icon="env.png"
 {if $cv.optional.kioskpath_active}
 				kioskpath="{$cv.optional.kioskpath}"
 {/if}
 				path="plugins/personal/environment" />
-			<plugin acl="default" class="mailAccount" icon="email.png"
+			<plugin acl="users/mailAccount" class="mailAccount" icon="email.png"
 				path="plugins/personal/mail" />
-			<plugin acl="default" class="sambaAccount" icon="samba.png"
+			<plugin acl="users/sambaAccount" class="sambaAccount" icon="samba.png"
 				path="plugins/personal/samba" />
 {if $cv.use_netatalk}
-			<plugin acl="default" class="netatalk" icon="netatalk.png"
+			<plugin acl="users/netatalk" class="netatalk" icon="netatalk.png"
 				path="plugins/personal/netatalk" />
 {else}
 <!--
@@ -24,39 +24,35 @@
 				path="plugins/personal/netatalk" />
 -->
 {/if}
-			<plugin acl="default" class="connectivity" icon="proxy.png"
+			<plugin acl="users/connectivity" class="connectivity" icon="proxy.png"
 				path="plugins/personal/connectivity" />
-			<plugin acl="default" class="gofaxAccount" icon="fax.png"
+			<plugin acl="users/gofaxAccount" class="gofaxAccount" icon="fax.png"
 				path="plugins/gofax/faxaccount" />
-			<plugin acl="default" class="phoneAccount" icon="phone.png"
+			<plugin acl="users/phoneAccount" class="phoneAccount" icon="phone.png"
 				path="plugins/gofon/phoneaccount" />
 <!--
-			<plugin acl="default" class="nagiosAccount" icon="monitoring.png"
+			<plugin acl="users/nagiosAccount" 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"
+			<plugin acl="users/password" class="password" icon="password.png"
 				path="plugins/personal/password" />
 		</section>
 		
 		<section name="Administration">
-			<plugin acl="user" class="userManagement" icon="user.png"
+			<plugin acl="users" class="userManagement" icon="user.png"
 				path="plugins/admin/users" />
-			<plugin acl="group" class="groupManagement" icon="group.png"
+			<plugin acl="groups" class="groupManagement" icon="group.png"
 				path="plugins/admin/groups" />
-			<plugin acl="ogroup" class="ogroupManagement" icon="ogroup.png"
+			<plugin acl="ogroups" class="ogroupManagement" icon="ogroup.png"
 				path="plugins/admin/ogroups" />
 			<plugin acl="department" class="departmentManagement" icon="department.png"
 				path="plugins/admin/departments" />
 			<plugin acl="application" class="applicationManagement"
 				icon="application.png" path="plugins/admin/applications" />
-			<plugin acl="systems" class="systems" icon="system.png"
+			<plugin acl="terminal,workstation,server,phone,printer,component,winworkstation" class="systems" icon="system.png"
 				path="plugins/admin/systems" />
 {if $cv.enableMimeType}
-			<plugin acl="mimetype" class="mimetypeManagement"
+			<plugin acl="mimetypes" class="mimetypeManagement"
 				icon="mimetypes.png" path="plugins/admin/mimetypes" />
 {else}
 <!--
@@ -69,7 +65,7 @@
 				'lock_type'    for branch/freeze -->
 
 {if $cv.enableFAI_management}
-			<plugin acl="FAIclass" class="faiManagement" icon="fai.png" 
+			<plugin acl="fai" class="faiManagement" icon="fai.png" 
 				path="plugins/admin/fai" />
 {else}
 <!--
@@ -77,11 +73,11 @@
 				path="plugins/admin/fai" />
 -->
 {/if}
-			<plugin acl="blocklists" class="blocklist" icon="blocklists.png"
+			<plugin acl="gofaxlist" class="blocklist" icon="blocklists.png"
 				path="plugins/gofax/blocklists" />
-			<plugin acl="goFonMacro" class="gofonMacro" icon="macros.png"
+			<plugin acl="gofonmacro" class="goFonMacro" icon="macros.png"
 				path="plugins/gofon/macro" />
-			<plugin acl="conference" class="phoneConferenceManagment" icon="conference.png"
+			<plugin acl="gofonconference" class="phoneConferenceManagment" icon="conference.png"
 				path="plugins/gofon/conference" />
 			<plugin acl="acl" class="acl" icon="acl.png"
 				path="plugins/admin/acl" />
@@ -100,7 +96,7 @@
 				path="plugins/addons/mailqueue" />
 			<plugin acl="ldapmanager" class="ldif" icon="ldif.png"
 				path="plugins/addons/ldapmanager" />
-			<plugin acl="notifications" class="msgplug" icon="notifications.png"
+			<plugin acl="msgplug" class="msgplug" icon="notifications.png"
 				path="plugins/addons/notifications" />
 {if $cv.optional.gotomasses_active}
 			<plugin acl="gotomasses" class="gotomasses" icon="system.png"
@@ -181,7 +177,7 @@
 	<servtabs>
 		<tab class="servgeneric" name="Generic" />
 		<tab class="workstartup" name="Startup" />
-		<tab class="serverService" name="Services" />
+		<tab class="ServerService" name="Services" />
 {if $cv.enableFAI_management}
 	    <tab class="faiSummaryTab" name="FAI summary" />
 {else}
@@ -221,7 +217,7 @@
 	</printtabs>
 
 	<phonetabs>
-		<tab class="phonegeneric" name="Generic" />
+		<tab class="phoneGeneric" name="Generic" />
 		<tab class="glpiAccount" name="Inventory" />
 	</phonetabs>
 
@@ -283,7 +279,6 @@
 		<tab class="pptpAccount" /> 
 		<tab class="phpscheduleitAccount" /> 
 -->
-		<tab class="glpiAccount" /> 
 	</connectivity>
 
 	<ldiftab>
@@ -373,7 +368,7 @@
 		pwdiffer="{$cv.pwd_rules.pwdiffer}"
 {/if}
 {if $cv.pwd_rules.externalpwdhook_active}
-		pwdiffer="{$cv.pwd_rules.externalpwdhook}"
+		externalpwdhook="{$cv.pwd_rules.externalpwdhook}"
 {/if}
 {if $cv.errorlvl}
 		displayerrors="true"
@@ -424,6 +419,16 @@
 {/if}
 {if $cv.optional.auto_network_hook_active}
 		auto_network_hook="{$cv.optional.auto_network_hook} "
+{/if}
+{if $cv.optional.user_filter_cookie}
+		save_filter="true"
+{else}
+		save_filter="false"
+{/if}
+{if $cv.compressed}
+		compressed="true"
+{else}
+		compressed="false"
 {/if}
 		lang="{$cv.lang_selected}"
 		theme="{$cv.theme}"