Updated contrib conf

[gosa.git] / gosa-core / include / class_pluglist.inc

diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index ba3288a63de2bcf49940029154be2c300c95c3b1..00645846710cde63a7b0fbe7482a64c2c5f7afb5 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -47,7 +47,7 @@ class pluglist {
                                foreach ($classes as $cname){
                                        $cmethods = get_class_methods($cname);
                                        if (in_array_ics('plInfo',$cmethods)){
-                                               $this->info[$cname]= @call_user_func(array($cname, 'plInfo'));
+                                               $this->info[$cname]= call_user_func(array($cname, 'plInfo'));
                                        }
                                }
 
@@ -257,7 +257,7 @@ class pluglist {
                        $cfg= $this->config->data['MENU'];
 
                        if (isset($this->config->current['ICONSIZE'])){
-                               list($x, $y)= split("x", $this->config->current['ICONSIZE']);
+                               list($x, $y)= split("x", $this->config->get_cfg_value("iconsize"));
                                $isize= "width=\"$x\" height=\"$y\"";
                        } else {
                                $isize= "";
@@ -306,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>";