Added patches from 2.5

[gosa.git] / include / class_pluglist.inc

diff --git a/include/class_pluglist.inc b/include/class_pluglist.inc
index c29dfde116dffe04c1fbd6f56ce917609ff0a3ea..f6267beb2fdf5cce01e29f6cb9de856a5a4b4343 100644 (file)
--- a/include/class_pluglist.inc
+++ b/include/class_pluglist.inc
@@ -137,7 +137,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&reset=1";
 
@@ -235,7 +235,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."&reset=1";
 
@@ -299,9 +299,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));
+
        }
 }
 ?>