X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_pluglist.inc;h=ecc77a18c519e517eadcab801409b3fa4e24bd3f;hb=cd5f4de8cfe3b506e563f61dca7f9dae0cccd19f;hp=6a68b8d43b2e4fcc1f1bac780c9cc14df7da4bb2;hpb=4e7c174ab21d1ef1f73f7bd152512782f0d02944;p=gosa.git diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 6a68b8d43..ecc77a18c 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -1,24 +1,25 @@ config= &$config; /* Create dirlist for all plugins */ - $this->dirlist= $this->get_plugins ($this->dirlist, $this->config->data); + $this->dirlist= $this->get_plugins ($this->dirlist, $this->config->data['MENU']); /* Fill info part of pluglist */ $classes= get_declared_classes(); @@ -58,27 +59,38 @@ class pluglist { function get_plugins($list, &$config) { + global $class_mapping; + /* Error reporting, because I'm getting strange messages in PHP 4.2.x */ - if (!isset($config['PATH']) && !isset($config['CLASS'])){ + if (!isset($config['CLASS'])){ if (is_array($config)){ foreach ($config as $val){ $list= $this->get_plugins($list, $val); } } } else { - if (isset ($config['PATH']) && is_array($config)){ - $list[$this->index++]= $config['PATH']; - if (isset($config['CLASS'])){ - $class= $config['CLASS']; - } + if (is_array($config) && isset($class_mapping[$config['CLASS']])){ + $list[$this->index++]= dirname($class_mapping[$config['CLASS']]); + } else { + $list[$this->index++]= ""; } } return ($list); } + + /*! \brief Check whether we are allowed to modify the given acl or nit.. + This function is used to check which plugins are visible. + + @param The acl tag to test, eg. "users/user:self", "systems", ... + @return Boolean TRUE on success else FALSE + */ function check_access($aclname) { + /* Split given acl string into an array. + e.g. "user,systems" => array("users","systems"); + */ $acls_to_check = array(); if(preg_match("/,/",$aclname)){ $acls_to_check = split(",",$aclname); @@ -87,22 +99,28 @@ class pluglist { } foreach($acls_to_check as $acl_to_check){ - $deps = $this->ui->get_module_departments($acl_to_check); - foreach($deps as $dep){ - if(preg_match("/\//",$acl_to_check)){ - if($this->ui->get_permissions($dep,$acl_to_check) != ""){ - return(TRUE); - } - }else{ - if($this->ui->get_category_permissions($dep,$acl_to_check) != ""){ - return(TRUE); - } + + /* Check if the given acl tag is only valid for self acl entries + ui->get_permissions($this->ui->dn,$acl_to_check,"") != ""){ + return(TRUE); } + return(FALSE); + }else{ + + /* No self acls. Check if we have any acls for the given ACL type + */ + $deps = $this->ui->get_module_departments($acl_to_check,TRUE); + if(count($deps)) return TRUE; } } return (FALSE); } + function gen_headlines() { $ret = array(); @@ -157,9 +175,7 @@ class pluglist { $plHeadline= $vars['plHeadline']; $plDescription= $vars['plDescription']; - - $index= $this->get_index($info['PATH'],$info['CLASS']); - $image= get_template_path('images/'.$info['ICON']); + $index= $this->get_index($info['CLASS']); $href= "main.php?plug=$index&reset=1"; if(!$vars){ @@ -180,15 +196,6 @@ class pluglist { _($plHeadline)."

\n"; } - /* Generate icon entry with description */ - $current= '
\"\"'; - if(session::get('js')){ - $current.= ''._($plHeadline).'
'._($plDescription); - } else { - $current.= ''._($plHeadline).'
'._($plDescription).''; - } - $current.= '
'; - $this->menuparts[_($headline)][]= $current; if(!session::is_set('maxC')){ session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"); } @@ -242,6 +249,8 @@ class pluglist { function show_iconmenu() { + global $class_mapping; + if ($this->iconmenu == ""){ $cfg= $this->config->data['MENU']; @@ -270,8 +279,13 @@ class pluglist { $vars= get_class_vars($info['CLASS']); $plHeadline= $vars['plHeadline']; $plDescription= $vars['plDescription']; + if (isset($vars['plIcon'])){ + $plIcon= $vars['plIcon']; + } else { + $plIcon= "plugin.png"; + } - $index= $this->get_index($info['PATH'],$info['CLASS']); + $index= $this->get_index($info['CLASS']); $href = "main.php?plug=".$index."&reset=1"; @@ -286,8 +300,12 @@ class pluglist { if ($this->check_access($info['ACL'])){ - /* Hm this looks doubled */ - $image= get_template_path('images/'.$info['ICON']); + /* Load icon */ + if (isset($info['ICON'])){ + $image= get_template_path('images/'.$info['ICON']); + } else { + $image= get_template_path("plugins/".preg_replace('%^.*/([^/]+)/[^/]+$%', '\1', $class_mapping[$info['CLASS']])."/images/$plIcon"); + } if ($col > 5){ $entries= $entries.""; $col = 1; @@ -343,21 +361,22 @@ class pluglist { return ("../".$this->dirlist[$index]); } - function get_index($path,$class) + function get_index($class) { /* 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){ + if($plugin['CLASS'] == $class){ return($key); } } } - /* Indentify by path*/ - return (array_search($path, $this->dirlist)); + /* Nothing */ + return (0); } } +// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: ?>