X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_pluglist.inc;h=f296fc621905ec3a5a1e19b2095d1cc6cf7df58b;hb=5939edc5d38843b634939eaa11e7df748eaf60ff;hp=89d55749e6da60b86c57542735e25a00d87ef658;hpb=2835d7267d670cd989a1cf753770cea823b8b67e;p=gosa.git

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index 89d55749e..f296fc621 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -70,7 +70,7 @@ class pluglist {
 		/* Look through ACL's */
 		foreach($this->ui->subtreeACL as $arr){
 			foreach($arr as $value){
-				if ($value == ':all' || preg_match("/[,:]$modname#/", $value)){
+				if ($value == ':all' || preg_match("/[,:]".normalizePreg($modname)."#/", $value)){
 					if (!preg_match('/^!/', $value)){
 						return (TRUE);
 					}
@@ -113,7 +113,7 @@ class pluglist {
 
 					/* Read information from class variable */
 					if (!isset($info['CLASS'])){
-						print_red(_("Your gosa.conf information has changed partly. Please convert it using the contributed script fix_config.sh!"));
+						print_red(sprintf(_("Your %s information has changed partly. Please convert it using the contributed script fix_config.sh!"),CONFIG_FILE));
 						echo $_SESSION['errors'];
 						exit;
 					}
@@ -135,13 +135,24 @@ class pluglist {
 					if ($this->check_access($info['ACL'])){
 						$this->allowed_plug_ids[$index]=$index;
 						$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";
 						}
@@ -242,10 +253,18 @@ 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++ ;
 
 					}