Code

Updated management.
[gosa.git] / gosa-core / include / class_pluglist.inc
index 00645846710cde63a7b0fbe7482a64c2c5f7afb5..528052a875c054e5d28e3f98bd51f356a48c0b1e 100644 (file)
@@ -31,7 +31,8 @@ class pluglist {
        var $current= "";
        var $info= array();
        var $headlines = array();
-  var $allowed_plugins = array();
+        var $allowed_plugins = array();
+        var $silly_cache= array();
 
        function pluglist(&$config, &$ui)
        {
@@ -41,15 +42,15 @@ class pluglist {
                /* Create dirlist for all plugins */
                $this->dirlist= $this->get_plugins ($this->dirlist, $this->config->data['MENU']);
 
-                /* Fill info part of pluglist */
-                $classes= get_declared_classes();
+               /* 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'));
-                                       }
-                               }
+               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();
@@ -60,9 +61,8 @@ class pluglist {
 
        function get_plugins($list, &$config)
        {
-                global $class_mapping;
+               global $class_mapping;
 
-               /* Error reporting, because I'm getting strange messages in PHP 4.2.x */
                if (!isset($config['CLASS'])){
                        if (is_array($config)){
                                foreach ($config as $val){
@@ -70,7 +70,7 @@ class pluglist {
                                }
                        }
                } else {
-                        if (is_array($config) && isset($class_mapping[$config['CLASS']])){
+                       if (is_array($config) && isset($class_mapping[$config['CLASS']])){
                                $list[$this->index++]= dirname($class_mapping[$config['CLASS']]);
                        } else {
                                $list[$this->index++]= "";
@@ -81,7 +81,7 @@ class pluglist {
        }
 
 
-       /*! \brief  Check whether we are allowed to modify the given acl or nit..
+       /*! \brief  Check whether we are allowed to modify the given acl or not..
                                This function is used to check which plugins are visible.
                                
                @param  The acl tag to test, eg.        "users/user:self", "systems", ...
@@ -89,6 +89,10 @@ class pluglist {
      */
        function check_access($aclname)
        {
+               if (isset($this->silly_cache[$aclname])) {
+                       return $this->silly_cache[$aclname];
+               }
+
                /* Split given acl string into an array. 
                        e.g. "user,systems" => array("users","systems");
          */
@@ -100,24 +104,30 @@ class pluglist {
                }
 
                foreach($acls_to_check as $acl_to_check){
+      $acl_to_check = trim($acl_to_check);
                
                        /* Check if the given acl tag is only valid for self acl entries  
-                 <plugin acl="users/user:self" class="user"...
-             */        
+                 <plugin acl="users/user:self" class="user"...  */     
                        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);
                                }
+                               $this->silly_cache[$aclname]= FALSE;
                                return(FALSE);
                        }else{
                
-                               /* No self acls. Check if we have any acls for the given ACL type 
-                 */
+                               /* 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;
+                               if(count($deps)){
+                                       $this->silly_cache[$aclname]= TRUE;
+                                       return TRUE;
+                               }
                        }
                }
+
+               $this->silly_cache[$aclname]= FALSE;
                return (FALSE);
        }
 
@@ -173,7 +183,11 @@ class pluglist {
                                                continue;
                                        }
                                        $vars= get_class_vars($info['CLASS']);
-                                       $plHeadline= $vars['plHeadline'];
+                                       if (isset($info['NAME'])){
+                                         $plHeadline= _($info['NAME']);
+                                        } else {
+                                         $plHeadline= $vars['plHeadline'];
+                                        }
                                        $plDescription= $vars['plDescription'];
 
                                        $index= $this->get_index($info['CLASS']);
@@ -191,7 +205,7 @@ class pluglist {
  
                                                $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')){
+                                               if(session::global_get('js')){
                                                        $entries.= _($plHeadline)."</p>\n";
                                                } else {
                                                        $entries.= "<a class=\"menuitem\" ".
@@ -318,7 +332,7 @@ class pluglist {
                                                }
                                                $entries= $entries."<td class=\"iconmenu\" style=\"width:20%;\" onClick='location.href=\"".$href."\"'".
                                                        ">";
-                                                       if(session::get('js')){
+                                                       if(session::global_get('js')){
                                                                $entries.= "<img $isize border=0 align=middle src=\"$image".
                                                                        "\" alt=\"*\">&nbsp;".
                                                                        _($plHeadline);