From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 Sep 2007 06:57:32 +0000 (+0000)
Subject: Updated menu creation.
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3e5c2e2d069dd27fde8e4a3a570b71602d61dab5;p=gosa.git

Updated menu creation.
Check acls for each plugin


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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 0de32e9a1..fa9fdca5b 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"
diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 78f290597..fd6fac154 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -77,24 +77,34 @@ class pluglist {
 		return ($list);
 	}
 
-	function check_access($modname)
+	function check_access($aclname)
 	{
-		/* This plugin is readable for everyone, return true */
-		if ($modname == 'default'){
-			return (TRUE);
+		$acl = "";
+		$deps = $this->ui->get_module_departments($aclname);
+
+		$acls_to_check = array();
+		if(preg_match("/,/",$aclname)){
+			$acls_to_check = split(",",$aclname);
+		}else{
+			$acls_to_check = array($aclname);
 		}
-
-		/* Look through ACL's */
-		foreach($this->ui->subtreeACL as $arr){
-			foreach($arr as $value){
-				if ($value == ':all' || preg_match("/[,:]$modname#/", $value)){
-					if (!preg_match('/^!/', $value)){
-						return (TRUE);
-					}
+	
+		if(preg_match("/\//",$aclname)){
+			foreach($deps as $dep){
+				foreach($acls_to_check as $acl_to_check){
+					$acl.=$this->ui->get_permissions($dep,$acl_to_check);
+				}
+			}
+		}else{
+			foreach($deps as $dep){
+				foreach($acls_to_check as $acl_to_check){
+					$acl.=$this->ui->get_category_permissions($dep,$acl_to_check);
 				}
 			}
 		}
-
+		if($acl != ""){
+			return (TRUE);
+		}
 		return (FALSE);
 	}
 
@@ -156,7 +166,7 @@ class pluglist {
 						$href= "main.php?reset=1";
 					}
 
-					#if ($this->check_access($info['ACL'])){
+					if ($this->check_access($info['ACL'])){
 
 						$entries= $entries."<p class=\"menuitem\" ".
 							"onClick='return question(\""._("You are currently editing a database entry. Do you want to dismiss the changes?")."\", \"$href\");'>";
@@ -180,7 +190,7 @@ class pluglist {
 						if(!isset($_SESSION['maxC'])){
 							$_SESSION['maxC'] = "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP";
 						}
-					#}
+					}
 				}
 
 				/* Append to menu */
@@ -268,7 +278,7 @@ class pluglist {
 					}
 
 
-					#if ($this->check_access($info['ACL'])){
+					if ($this->check_access($info['ACL'])){
 
 						/* Hm this looks doubled */
 						$image= get_template_path('images/'.$info['ICON']);
@@ -291,7 +301,7 @@ class pluglist {
 							$entries.= "</td>\n";
 						$col++ ;
 
-					#}
+					}
 				}
 
 				/* Append to menu */
diff --git a/plugins/gofon/fonreports/class_fonreport.inc b/plugins/gofon/fonreports/class_fonreport.inc
index a17500b84..5bd788c36 100644
--- a/plugins/gofon/fonreports/class_fonreport.inc
+++ b/plugins/gofon/fonreports/class_fonreport.inc
@@ -398,7 +398,7 @@ class fonreport extends plugin
         "plDepends"     => array(),
         "plPriority"    => 0,
         "plSection"     => array("administration"),
-        "plCategory"    => array("gofon"),
+        "plCategory"    => array("fonreport"),
   
         "plProvidedAcls" => array(
           "calldate"      =>_("Date"),