X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_pluglist.inc;h=714a3afc76a63da0b7d4886586643312e2f6b3eb;hb=dc43e93accd4cbba7c509d879579701e48c9d3be;hp=a1937cafdc41e092211ed03f75f197a42f020a49;hpb=ce17142f0f30f76e4d4383a6387d1b7ef70adaec;p=gosa.git

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index a1937cafd..714a3afc7 100644
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -142,18 +142,6 @@ class pluglist {
 
 	function gen_menu()
 	{
-    /* Check if class_location.inc has changed, this is the case 
-        if we have installed or removed plugins. 
-     */
-    if(session::is_set("class_location.inc:timestamp")){
-      $tmp = stat("../include/class_location.inc");
-      if($tmp['mtime'] != session::get("class_location.inc:timestamp")){
-        $this->menu = "";
-      }
-    }
-    $tmp = stat("../include/class_location.inc");
-    session::set("class_location.inc:timestamp",$tmp['mtime']);
-
 		if ($this->menu == ""){
 			$first= TRUE;
 			$cfg= $this->config->data['MENU'];
@@ -265,19 +253,6 @@ class pluglist {
 	function show_iconmenu()
 	{
 		global $class_mapping;
-
-    /* Check if class_location.inc has changed, this is the case 
-        if we have installed or removed plugins. 
-     */
-    if(session::is_set("class_location.inc:timestamp")){
-      $tmp = stat("../include/class_location.inc");
-      if($tmp['mtime'] != session::get("class_location.inc:timestamp")){
-        $this->iconmenu = "";
-      }
-    }
-    $tmp = stat("../include/class_location.inc");
-    session::set("class_location.inc:timestamp",$tmp['mtime']);
-
 		if ($this->iconmenu == ""){
 			$cfg= $this->config->data['MENU'];
 
@@ -331,7 +306,11 @@ class pluglist {
 						if (isset($info['ICON'])){
 							$image= get_template_path('images/'.$info['ICON']);
 						} else {
+              if(!preg_match("/\//",$plIcon)){
 					  		$image= get_template_path("plugins/".preg_replace('%^.*/([^/]+)/[^/]+$%', '\1', $class_mapping[$info['CLASS']])."/images/$plIcon");
+              }else{
+                $image = $plIcon; 
+              }
 						}
 						if ($col > 5){
 							$entries= $entries."</tr><tr>";
@@ -413,6 +392,16 @@ class pluglist {
   {
     return(isset($this->allowed_plugins[$plug_id]));
   }
+
+
+  /*! \brief  Force the menu to be recreated 
+   */
+  function reset_menus()
+  {
+    $this->menu = "";
+    $this->iconmenu ="";
+  }
+
 }
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
 ?>