Corrected tag check.

[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 34f30c8fc3ec357c9887e4e83e664bbbbb6d3bda..8f24af3399412b74debcef9f1c6a407b605cd248 100644 (file)
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -79,26 +79,21 @@ class pluglist {
 
        function check_access($aclname)
        {
-               $deps= $this->ui->get_module_departments($aclname);
-
                $acls_to_check = array();
                if(preg_match("/,/",$aclname)){
                        $acls_to_check = split(",",$aclname);
                }else{
                        $acls_to_check = array($aclname);
                }
-       
-               if(preg_match("/\//",$aclname)){
+
+               foreach($acls_to_check as $acl_to_check){
+                       $deps = $this->ui->get_module_departments($acl_to_check);
                        foreach($deps as $dep){
-                               foreach($acls_to_check as $acl_to_check){
+                               if(preg_match("/\//",$acl_to_check)){
                                        if($this->ui->get_permissions($dep,$acl_to_check) != ""){
                                                return(TRUE);
                                        }
-                               }
-                       }
-               }else{
-                       foreach($deps as $dep){
-                               foreach($acls_to_check as $acl_to_check){
+                               }else{
                                        if($this->ui->get_category_permissions($dep,$acl_to_check) != ""){
                                                return(TRUE);
                                        }
@@ -114,9 +109,11 @@ class pluglist {
                if(count($this->headlines) == 0){
                        foreach($this->config->data['MENU'] as $headline => $plugins){
                                foreach( $plugins as $id => $plug){
-                                       $attrs = (get_class_vars($plug['CLASS']));
-                                       $ret[$id]['HEADLINE'] = $headline;
-                                       $ret[$id]['NAME']         = $attrs['plHeadline'];       
+                                       if (plugin_available($plug['CLASS'])){
+                                               $attrs = (get_class_vars($plug['CLASS']));
+                                               $ret[$id]['HEADLINE'] = $headline;
+                                               $ret[$id]['NAME']         = $attrs['plHeadline'];
+                                       }
                                }
                        }
                        $this->headlines = $ret;
@@ -147,9 +144,12 @@ class pluglist {
 
                                        /* Read information from class variable */
                                        if (!isset($info['CLASS'])){
-                                               print_red(_("Your gosa.conf format has changed. Please re-run setup!"));
+                                               msg_dialog::display(_("Configuration error"), _("The configuration format has changed. Please re-run setup!"), ERROR_DIALOG);
                                                display_error_page();
                                        }
+                                       if (!plugin_available($info['CLASS'])){
+                                               continue;
+                                       }
                                        $vars= get_class_vars($info['CLASS']);
                                        $plHeadline= $vars['plHeadline'];
                                        $plDescription= $vars['plDescription'];
@@ -169,7 +169,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['js']){
+                                               if(session::get('js')){
                                                        $entries.= _($plHeadline)."</p>\n";
                                                } else {
                                                        $entries.= "<a class=\"menuitem\" ".
@@ -179,7 +179,7 @@ class pluglist {
 
                                                /* Generate icon entry with description */
                                                $current= '<table summary=\"\" class="menuitem" onClick=\'location.href="'.$href.'"\'><tr><td style="background-color:#F0F0F0;"><a href="'.$href.'"><img alt=\"\" border=0 src="'.$image.'"></a></td><td style="width:100%; vertical-align:top; text-align:justify; padding-left:10px;">';
-                                               if($_SESSION['js']){
+                                               if(session::get('js')){
                                                        $current.= '<b>'._($plHeadline).'</b><br>'._($plDescription);
                                                } else {
                                                        $current.= '<a href="'.$href.'"><b>'._($plHeadline).'</b></a><br><a href="'.$href.'">'._($plDescription).'</a>';
@@ -187,7 +187,7 @@ class pluglist {
                                                $current.= '</td></tr></table>';
                                                $this->menuparts[_($headline)][]= $current;
                                                if(!session::is_set('maxC')){
-                                                       $_SESSION['maxC'] = "RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP";
+                                                       session::set('maxC',"RO0K9CzEYCSAAOtOICCFhEDBKGSKANyHMKDHAEwFLNTJILwEMODJYPgMRA0F9IOPSPUKNEVCUKyDBAHNbIWFJOIP");
                                                }
                                        }
                                }
@@ -259,6 +259,10 @@ class pluglist {
 
                                foreach ($plug as $info){
 
+                                       if (!plugin_available($info['CLASS'])){
+                                               continue;
+                                       }
+
                                        /* Read information from class variable */
                                        $vars= get_class_vars($info['CLASS']);
                                        $plHeadline= $vars['plHeadline'];
@@ -287,7 +291,7 @@ class pluglist {
                                                }
                                                $entries= $entries."<td class=\"iconmenu\" style=\"width:20%;\" onClick='location.href=\"".$href."\"'".
                                                        ">";
-                                                       if($_SESSION['js']){
+                                                       if(session::get('js')){
                                                                $entries.= "<img $isize border=0 align=middle src=\"$image".
                                                                        "\" alt=\"*\">&nbsp;".
                                                                        _($plHeadline);