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 54b5c67644a0df08132bb5b74ba0615f1a5f1ef0..00645846710cde63a7b0fbe7482a64c2c5f7afb5 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -31,6 +31,7 @@ class pluglist {
        var $current= "";
        var $info= array();
        var $headlines = array();
+  var $allowed_plugins = array();
 
        function pluglist(&$config, &$ui)
        {
@@ -46,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'));
                                        }
                                }
 
@@ -113,7 +114,7 @@ class pluglist {
                
                                /* No self acls. Check if we have any acls for the given ACL type 
                  */
-                               $deps = $this->ui->get_module_departments($acl_to_check);
+                               $deps = $this->ui->get_module_departments($acl_to_check,TRUE);
                                if(count($deps)) return TRUE;
                        }
                }
@@ -186,6 +187,8 @@ class pluglist {
 
                                        if ($this->check_access($info['ACL'])){
 
+            $this->allowed_plugins[$index] = $index;
+ 
                                                $entries= $entries."<p class=\"menuitem\" ".
                                                        "onClick='return question(\""._("You are currently editing a database entry. Do you want to dismiss the changes?")."\", \"$href\");'>";
                                                if(session::get('js')){
@@ -250,12 +253,11 @@ class pluglist {
        function show_iconmenu()
        {
                global $class_mapping;
-
                if ($this->iconmenu == ""){
                        $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= "";
@@ -304,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>";
@@ -377,6 +383,25 @@ class pluglist {
                 return (0);
 
        }
+
+  /*! \brief  This function checks if we are allowed to view the plugin with the given id 
+      @param  $plug_id  Integer  The ID of the plugin.
+      @return Boolean   TRUE if we are allowed to view the plugin else FASLE
+   */
+  function plugin_access_allowed($plug_id)
+  {
+    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:
 ?>