X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_pluglist.inc;h=3468ce3bdb43564a5837e8780ff03eea21c32f70;hb=45af86cd801883d1c4032ec539db39156a328058;hp=c29dfde116dffe04c1fbd6f56ce917609ff0a3ea;hpb=da6de1ed136c1659d451e61cf00b950b7cf2e249;p=gosa.git

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index c29dfde11..3468ce3bd 100644
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -41,11 +41,13 @@ class pluglist {
 
                 /* Fill info part of pluglist */
                 $classes= get_declared_classes();
-                foreach (get_declared_classes() as $cname){
-                        if (method_exists($cname, 'plInfo')){
-                                $this->info[$cname]= @call_user_func(array($cname, 'plInfo'));
-                        }
-                }
+
+				foreach ($classes as $cname){
+					$cmethods = get_class_methods($cname);
+					if (in_array_ics('plInfo',$cmethods)){
+						$this->info[$cname]= @call_user_func(array($cname, 'plInfo'));
+					}
+				}
 
 		/* Provide field for 'all' */
 		$this->info['all']= array();
@@ -115,11 +117,18 @@ class pluglist {
 	function gen_menu()
 	{
 		if ($this->menu == ""){
+			$first= TRUE;
 			$cfg= $this->config->data['MENU'];
 
 			/* Parse headlines */
 			foreach ($cfg as $headline => $plug){
-				$menu= "<p class=\"menuheader\">"._($headline)."</p>\n";
+				if ($first){
+					$style= "";
+					$first= FALSE;
+				} else {
+					$style= "style='border-top:1px solid #AAA; margin-top:0.8em;'";
+				}
+				$menu= "<p class=\"menuheader\" $style>"._($headline)."</p>\n";
 				$entries= "";
 				$this->menuparts[_($headline)]= array();
 
@@ -137,7 +146,7 @@ class pluglist {
 					$plDescription= $vars['plDescription'];
 
 
-					$index= $this->get_index($info['PATH']);
+					$index= $this->get_index($info['PATH'],$info['CLASS']);
 					$image= get_template_path('images/'.$info['ICON']);
 					$href= "main.php?plug=$index&amp;reset=1";
 
@@ -150,13 +159,24 @@ class pluglist {
 					#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";
 						}
@@ -235,7 +255,7 @@ class pluglist {
 					$plHeadline= $vars['plHeadline'];
 					$plDescription= $vars['plDescription'];
 
-					$index= $this->get_index($info['PATH']);
+					$index= $this->get_index($info['PATH'],$info['CLASS']);
 
 					$href = "main.php?plug=".$index."&amp;reset=1";
 
@@ -257,10 +277,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++ ;
 
 					#}
@@ -299,9 +327,21 @@ class pluglist {
 		return ("../".$this->dirlist[$index]);
 	}
 
-	function get_index($path)
+	function get_index($path,$class)
 	{
-		return (array_search($path, $this->dirlist));
+		/* Search for plugin index (id), identify entry by path && class */
+                $data = $this->config->data['MENU'];
+                foreach($data as $section => $plugins){
+                        foreach($plugins as $key => $plugin)    {
+                                if($plugin['CLASS'] == $class && $plugin['PATH'] == $path){
+                                        return($key);
+                                }
+                        }
+                }
+
+		/* Indentify by path*/
+                return (array_search($path, $this->dirlist));
+
 	}
 }
 ?>