X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fclass_pluglist.inc;h=1327a6350c4517e37dba3e75388edbbabebc563c;hb=f26ba868f04f17cee7e26921d0fd977a4632bfdb;hp=384817bd303c7cf032f354c00a9b75f8fb9920c9;hpb=2f503946138b7e287d1a7cef73057adf0bd204a8;p=gosa.git

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 384817bd3..1327a6350 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -31,10 +31,10 @@ class pluglist {
 	var $info= array();
 	var $headlines = array();
 
-	function pluglist($config, $ui)
+	function pluglist(&$config, &$ui)
 	{
-		$this->ui= $ui;
-		$this->config= $config;
+		$this->ui= &$ui;
+		$this->config= &$config;
 
 		/* Create dirlist for all plugins */
 		$this->dirlist= $this->get_plugins ($this->dirlist, $this->config->data);
@@ -56,7 +56,7 @@ class pluglist {
 		$this->info['all']['plSelfModify']= FALSE;
 	}
 
-	function get_plugins($list, $config)
+	function get_plugins($list, &$config)
 	{
 		/* Error reporting, because I'm getting strange messages in PHP 4.2.x */
 		if (!isset($config['PATH']) && !isset($config['CLASS'])){
@@ -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);
-		}
+		$deps = $this->ui->get_module_departments($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);
+		$acls_to_check = array();
+		if(preg_match("/,/",$aclname)){
+			$acls_to_check = split(",",$aclname);
+		}else{
+			$acls_to_check = array($aclname);
+		}
+	
+		if(preg_match("/\//",$aclname)){
+			foreach($deps as $dep){
+				foreach($acls_to_check as $acl_to_check){
+					if($this->ui->get_permissions($dep,$acl_to_check) != ""){
+						return(TRUE);
+					}
+				}
+			}
+		}else{
+			foreach($deps as $dep){
+				foreach($acls_to_check as $acl_to_check){
+					if($this->ui->get_category_permissions($dep,$acl_to_check) != ""){
+						return(TRUE);
 					}
 				}
 			}
 		}
-
 		return (FALSE);
 	}
 
@@ -156,20 +166,31 @@ 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\");'>".
-							"<a class=\"menuitem\" ".
+							"onClick='return question(\""._("You are currently editing a database entry. Do you want to dismiss the changes?")."\", \"$href\");'>";
+						if($_SESSION['js']){
+							$entries.= _($plHeadline)."</p>\n";
+						} else {
+							$entries.= "<a class=\"menuitem\" ".
 							"href=\"$href\">".
 							_($plHeadline)."</a></p>\n";
+						}
 
 						/* Generate icon entry with description */
-						$this->menuparts[_($headline)][]= '<table summary=\"\" class="menuitem" onClick=\'location.href="'.$href.'"\'><tr><td style="background-color:#F0F0F0;"><a href="'.$href.'"><img alt=\"\" border=0 src="'.$image.'"></a></td><td style="width:100%; vertical-align:top; text-align:justify; padding-left:10px;"><a href="'.$href.'"><b>'._($plHeadline).'</b></a><br><a href="'.$href.'">'._($plDescription).'</a></td></tr></table>';
+						$current= '<table summary=\"\" class="menuitem" onClick=\'location.href="'.$href.'"\'><tr><td style="background-color:#F0F0F0;"><a href="'.$href.'"><img alt=\"\" border=0 src="'.$image.'"></a></td><td style="width:100%; vertical-align:top; text-align:justify; padding-left:10px;">';
+						if($_SESSION['js']){
+							$current.= '<b>'._($plHeadline).'</b><br>'._($plDescription);
+						} else {
+							$current.= '<a href="'.$href.'"><b>'._($plHeadline).'</b></a><br><a href="'.$href.'">'._($plDescription).'</a>';
+						}
+						$current.= '</td></tr></table>';
+						$this->menuparts[_($headline)][]= $current;
 						if(!isset($_SESSION['maxC'])){
 							$_SESSION['maxC'] = "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP";
 						}
-					#}
+					}
 				}
 
 				/* Append to menu */
@@ -257,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']);
@@ -266,13 +287,21 @@ class pluglist {
 							$col = 1;
 						}
 						$entries= $entries."<td class=\"iconmenu\" style=\"width:20%;\" onClick='location.href=\"".$href."\"'".
-							"><a class=\"iconmenu\" href=\"".$href."\">".
-							"<img $isize border=0 align=middle src=\"$image".
-							"\" alt=\"*\">&nbsp;".
-							_($plHeadline)."</a></td>\n";
+							">";
+							if($_SESSION['js']){
+								$entries.= "<img $isize border=0 align=middle src=\"$image".
+									"\" alt=\"*\">&nbsp;".
+									_($plHeadline);
+							} else {
+								$entries.= "<a class=\"iconmenu\" href=\"".$href."\">".
+									"<img $isize border=0 align=middle src=\"$image".
+									"\" alt=\"*\">&nbsp;".
+									_($plHeadline)."</a>";
+							}
+							$entries.= "</td>\n";
 						$col++ ;
 
-					#}
+					}
 				}
 
 				/* Append to menu */