Deliverydate als Option bei Waren-/Dienstleistungs-/Erzeugnisberichten eingefuegt.

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

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 0bdf945..bef5242 100644 (file)
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -138,7 +138,7 @@ sub menuitemNew {
 }
 
 sub access_control {
-  $main::lxdebug->enter_sub();
+  $main::lxdebug->enter_sub(2);
 
   my ($self, $myconfig, $menulevel) = @_;
 
@@ -150,21 +150,31 @@ sub access_control {
     @menu = grep { /^${menulevel}--/ } @{ $self->{ORDER} };
   }
 
-  my @a    = split /;/, $myconfig->{acs};
-  my $excl = ();
-
-  # remove --AR, --AP from array
-  grep { ($a, $b) = split /--/; s/--$a$//; } @a;
+  my @a = split /;/, $myconfig->{acs};
+  my %excl;
 
   map { $excl{$_} = 1 } @a;
 
   @a = ();
   map { push @a, $_ unless $excl{$_} } (@menu);
 
-  $main::lxdebug->leave_sub();
+  $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);
+  }
+}
+
 1;