X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_pluglist.inc;h=0f89f3b611bb05aeda5ba7c67a386a0236578d9b;hb=e1e757ca6816d818fa1a393b66f165ffefb1afe7;hp=a680868dbe83ee199d11ce637b978ae1778d507e;hpb=5c1d6cc0b88013ca9fffe0e456d3d4493ecfecb3;p=gosa.git diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index a680868db..0f89f3b61 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -22,20 +22,32 @@ class pluglist { + // The id of the last registered plugin id var $index= 0; + var $config= NULL; - var $dirlist= array(); var $ui= NULL; - var $info= array(); + + // Contains a list of the paths for all registered plugins. + var $dirlist= array(); + + // Seems to be used in the help menu to generate an overview. var $headlines = array(); + // Remember stuff in here. var $silly_cache= array(); + // The pluglist keeps track of all registered plugins. + // (Registered plugins are those we are able to access) var $pluginList = array(); + // Some cache vars to avoid regenration of the menus. var $pathMenu = ""; var $menu= ""; var $iconmenu= ""; + // Classes plInfo list + var $info = array(); + function pluglist(&$config, &$ui) { $this->ui= &$ui; @@ -47,36 +59,23 @@ class pluglist { $this->pluginList = array(); - // First load the menu plugins and try to register them in the pluglist - // if this fails for some reason, then remove the plugin from the menu. - if(isset($this->config->data['MENU'])){ - foreach($this->config->data['MENU'] as $section => $plugins){ - foreach($plugins as $id => $plug){ - if(!$this->registerPlugin($plug)){ - unset($this->config->data['MENU'][$section][$id]); - } - } - } - } - - // Now load the path menu and try to register the plugins in the pluglist - // if this fails for some reason, then remove the plugin from the menu. - if(isset($this->config->data['PATHMENU'])){ - foreach($this->config->data['PATHMENU'] as $id => $plugin){ - if(!$this->registerPlugin($plugin)){ - unset($this->config->data['PATHMENU'][$id]); - } - } - } + /* Fill info part of pluglist */ + $classes= get_declared_classes(); + foreach ($classes as $cname){ + $cmethods = get_class_methods($cname); + if (in_array_ics('plInfo',$cmethods)){ + $this->info[$cname]= call_user_func(array($cname, 'plInfo')); + } + } if(!session::is_set('maxC')){ session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"); } - - // Now generate menu - usually they are cached - $this->gen_menu(); - $this->show_iconmenu(); - $this->genPathMenu(); +// +// // Now generate menu - usually they are cached +// $this->gen_menu(); +// $this->show_iconmenu(); +// $this->genPathMenu(); } @@ -91,7 +90,7 @@ class pluglist if (!isset($plug['CLASS'])){ msg_dialog::display( _("Configuration error"), - _("The configuration format has changed. Please re-run setup!"), + _("The configuration format has changed: please run the setup again!"), FATAL_ERROR_DIALOG); exit(); } @@ -136,12 +135,17 @@ class pluglist */ if(preg_match("/:self$/",$acl_to_check)){ $acl_to_check = preg_replace("/:self$/","",$acl_to_check); - if($this->ui->get_permissions($this->ui->dn,$acl_to_check,"") != ""){ - $this->silly_cache[$aclname]= TRUE; - return(TRUE); + if(strpos($acl_to_check,"/")){ + if($this->ui->get_permissions($this->ui->dn,$acl_to_check,"") != ""){ + $this->silly_cache[$aclname]= TRUE; + return(TRUE); + } + }else{ + if($this->ui->get_category_permissions($this->ui->dn,$acl_to_check,"") != ""){ + $this->silly_cache[$aclname]= TRUE; + return(TRUE); + } } - $this->silly_cache[$aclname]= FALSE; - return(FALSE); }else{ // No self acls. Check if we have any acls for the given ACL type @@ -169,6 +173,19 @@ class pluglist function gen_menu() { if ($this->menu == ""){ + + // First load the menu plugins and try to register them in the pluglist + // if this fails for some reason, then remove the plugin from the menu. + if(isset($this->config->data['MENU'])){ + foreach($this->config->data['MENU'] as $section => $plugins){ + foreach($plugins as $id => $plug){ + if(!$this->registerPlugin($plug)){ + unset($this->config->data['MENU'][$section][$id]); + } + } + } + } + $cfg= $this->config->data['MENU']; $menu = "\n
"; foreach ($cfg as $headline => $plug){ @@ -190,9 +207,9 @@ class pluglist $menu .= "\n
  • ".$title."
    • "; } $menu.= "\n "; - $menu.= "\n
    "; + $menu.= "\n
     
    "; $menu.= "\n
    \n"; - $menu.= "\n
    "; + $menu.= "\n
     
    "; $menu.= "\n
    \n"; } $menu.= "\n \n"; @@ -203,7 +220,7 @@ class pluglist $this->menu .= "\n \n"; @@ -237,6 +254,7 @@ class pluglist $add_hr =FALSE; $this->iconmenu = ""; if ($this->iconmenu == ""){ + $cfg= $this->config->data['MENU']; foreach ($cfg as $headline => $plug){ $col= 0; @@ -282,13 +300,24 @@ class pluglist function genPathMenu() { if(empty($this->pathMenu)){ + + // Now load the path menu and try to register the plugins in the pluglist + // if this fails for some reason, then remove the plugin from the menu. + if(isset($this->config->data['PATHMENU'])){ + foreach($this->config->data['PATHMENU'] as $id => $plugin){ + if(!$this->registerPlugin($plugin)){ + unset($this->config->data['PATHMENU'][$id]); + } + } + } + $this->pathMenu = "\n
    ". "\n "; $this->pathMenu.= "\n
    "; - } - return($this->pathMenu); + } + + $menu = pathNavigator::getCurrentPath(); + return(preg_replace("/%navigator%/", $menu, $this->pathMenu)); }