X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_pluglist.inc;h=ee593b34ba9b2a60c558783e523a4539d22cbe5d;hb=dfd337167feecfc96bf7ecceda0bc548b2f30cd1;hp=6e1c059a76836d7cd55364a359649213835cc8b2;hpb=215db919f9ff5be97ea91f840cdfc574d66868b5;p=gosa.git diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index 6e1c059a7..ee593b34b 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -22,32 +22,36 @@ 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; $this->config= &$config; - - // Reserve a special ACL will allows us to display plugins/addons whenever a user - // is able to login into gosa. E.g. some kind of welcome page. - $this->info['all']= array(); - $this->info['all']['plProvidedAcls']= array(); - $this->info['all']['plDescription']= _("All objects in this category"); - $this->info['all']['plSelfModify']= FALSE; - $this->loadPluginList(); } @@ -55,44 +59,36 @@ class pluglist { $this->pluginList = array(); - // Detect installed plugins and their configuration, to be able to restrict access later. - $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')); - } - } - - // First load Menu Plugins - 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 register pathMenu plugins - 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')); + } + } + + /* Provide field for 'all' */ + $this->info['all']= array(); + $this->info['all']['plProvidedAcls']= array(); + $this->info['all']['plDescription']= _("All objects in this category"); + $this->info['all']['plSelfModify']= FALSE; if(!session::is_set('maxC')){ session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP"); } - $this->gen_menu(); - $this->show_iconmenu(); - $this->genPathMenu(); +// +// // Now generate menu - usually they are cached +// $this->gen_menu(); +// $this->show_iconmenu(); +// $this->genPathMenu(); } + /*! \brief Tries to register a plugin in the pluglist + * Checks existence and ACL for the given plugin. + * Returns true in case of success else false. + */ function registerPlugin($plug) { global $class_mapping; @@ -100,7 +96,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(); } @@ -145,12 +141,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 @@ -178,15 +179,28 @@ 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
\n"; $this->menu = $menu; // Add javascript method to print out warning messages while leaving an unsaved form. // We do it in here to get the string translated. - $this->menu .= " - - "; + $this->menu .= + "\n \n"; } // Use javascript to mark the currently selected plugin. $menu = $this->menu; if(isset($_GET['plug'])){ - $menu.= " - - "; + $menu.= + "\n \n"; } // Return the generated/cached gosa menu. @@ -246,17 +258,19 @@ class pluglist function show_iconmenu() { $add_hr =FALSE; + $this->iconmenu = ""; if ($this->iconmenu == ""){ + $cfg= $this->config->data['MENU']; foreach ($cfg as $headline => $plug){ $col= 0; - $this->iconmenu .= "\n \n"; + $this->iconmenu .= "\n "; if($add_hr){ $add_hr = FALSE; - $this->iconmenu .= "\n