X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/c617a444526ae87cca99936a613ceb6ded70ba6e..98e679e3eb9f09d13938df305cad3f47a5862b9f:/SL/Menu.pm

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 06ea6ee43..873701616 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -34,29 +34,28 @@
 
 package Menu;
 
+use strict;
+
 use SL::Auth;
 use SL::Inifile;
 
-use strict;
+our @ISA = qw(Inifile);
+
 
 sub new {
   $main::lxdebug->enter_sub();
 
-  my ($type, @menufiles) = @_;
-  my $self               = bless {}, $type;
-
-  my @order;
+  my ($package, @menufiles) = @_;
 
-  foreach my $menufile (grep { -f } @menufiles) {
-    my $inifile = Inifile->new($menufile);
+  my $self = $package->SUPER::new($menufiles[0]);
 
-    push @order, @{ delete($inifile->{ORDER}) || [] };
-    $self->{$_} = $inifile->{$_} for keys %{ $inifile };
+  for (@menufiles[1..$#menufiles]) {
+    my $inifile = Inifile->new($_);
+    push @{ $self->{ORDER} }, @{ delete $inifile->{ORDER} };
+    $self->{$_} = $inifile->{$_} for keys %$inifile;
   }
 
-  $self->{ORDER} = \@order;
-
-  $self->set_access();
+  $self->set_access;
 
   $main::lxdebug->leave_sub();
 
@@ -68,14 +67,11 @@ sub menuitem_new {
 
   my ($self, $name, $item) = @_;
 
-  my $form        =  $main::form;
-  my $myconfig    = \%main::myconfig;
-
-  my $module      = $self->{$name}->{module} || $form->{script};
+  my $module      = $self->{$name}->{module} || $::form->{script};
   my $action      = $self->{$name}->{action};
 
   $item->{target} = $self->{$name}->{target} || "main_window";
-  $item->{href}   = $self->{$name}->{href}   || "${module}?action=" . $form->escape($action);
+  $item->{href}   = $self->{$name}->{href}   || "${module}?action=" . $::form->escape($action);
 
   my @vars = qw(module target href);
   push @vars, 'action' unless ($self->{$name}->{href});
@@ -85,8 +81,8 @@ sub menuitem_new {
   # add other params
   foreach my $key (keys %{ $self->{$name} }) {
     my ($value, $conf)  = split(m/=/, $self->{$name}->{$key}, 2);
-    $value              = $myconfig->{$value} . "/$conf" if ($conf);
-    $item->{href}      .= "&" . $form->escape($key) . "=" . $form->escape($value);
+    $value              = $::myconfig->{$value} . "/$conf" if ($conf);
+    $item->{href}      .= "&" . $::form->escape($key) . "=" . $::form->escape($value);
   }
 
   $main::lxdebug->leave_sub(LXDebug::DEBUG2());
@@ -147,7 +143,7 @@ sub parse_access_string {
       push @{$cur_ary}, $token;
 
     } else {
-      push @{$cur_ary}, $auth->check_right($form->{login}, $token, 1);
+      push @{$cur_ary}, $auth->check_right($::myconfig{login}, $token, 1);
     }
   }
 
@@ -162,6 +158,11 @@ sub parse_access_string {
   return SL::Auth::evaluate_rights_ary($stack[0]);
 }
 
+sub parse_instance_conf_string {
+  my ($self, $setting) = @_;
+  return $::instance_conf->data->{$setting};
+}
+
 sub set_access {
   my $self = shift;
 
@@ -171,6 +172,7 @@ sub set_access {
     my $entry = $self->{$key};
 
     $entry->{GRANTED}              = $entry->{ACCESS} ? $self->parse_access_string($key, $entry->{ACCESS}) : 1;
+    $entry->{GRANTED}            &&= $self->parse_instance_conf_string($entry->{INSTANCE_CONF}) if $entry->{INSTANCE_CONF};
     $entry->{IS_MENU}              = $entry->{submenu} || ($key !~ m/--/);
     $entry->{NUM_VISIBLE_CHILDREN} = 0;