Updated framework

[gosa.git] / include / class_pluglist.inc

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index f6267beb2fdf5cce01e29f6cb9de856a5a4b4343..3468ce3bdb43564a5837e8780ff03eea21c32f70 100644 (file)
--- 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();
 
@@ -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";
                                                }
@@ -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++ ;
 
                                        #}