Vergessener Lauf von locales.pl

[kivitendo-erp.git] / SL / Menu.pm

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 8ded1dde8d7d34c9617c0dad9bda49b89f25bb25..81eedb1a804228bcc7ed2340b6729269a2e9d623 100644 (file)
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -121,7 +121,7 @@ sub menuitem_new {
   $item->{href}   = $self->{$name}->{href}   || "${module}?action=" . $form->escape($action);
 
   my @vars = qw(module target href);
   $item->{href}   = $self->{$name}->{href}   || "${module}?action=" . $form->escape($action);
 
   my @vars = qw(module target href);

-  push @vars, $action unless ($self->{$name}->{href});
+  push @vars, 'action' unless ($self->{$name}->{href});

 
   map { delete $self->{$name}{$_} } @vars;
 
 
   map { delete $self->{$name}{$_} } @vars;
 


@@ -264,33 +264,9 @@ sub access_control {
     @menu = grep { /^${menulevel}--/ } @{ $self->{ORDER} };
   }
 
     @menu = grep { /^${menulevel}--/ } @{ $self->{ORDER} };
   }
 

-  my @a    = split(/;/, $myconfig->{acs});
-  my $excl = ();
-
-  # remove --AR, --AP from array
-  grep { ($a, $b) = split(/--/); s/--$a$//; } @a;
-
-  map { $excl{$_} = 1 } @a;
-
-  @a = ();
-  map { push @a, $_ unless $excl{$_} } (@menu);
-

   $main::lxdebug->leave_sub(2);
 
   $main::lxdebug->leave_sub(2);
 

-  return @a;
-}
-
-sub generate_acl {
-  my ($self, $menulevel, $hash) = @_;
-
-  my @items = $self->access_control(\%main::myconfig, $menulevel);
-
-  $menulevel =~ s/[^A-Za-z_\/\.\+\-]/_/g;
-  $hash->{"access_" . lc($menulevel)} = 1 if ($menulevel);
-
-  foreach my $item (@items) {
-    $self->generate_acl($item, $hash); #unless ($menulevel);
-  }
+  return @menu;

 }
 
 sub parse_access_string {
 }
 
 sub parse_access_string {