X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=5da42e64a06443e3932c839a1aaa02bb2d04875f;hb=5e49b259ece6c5e4aa80e9c775a894972a139547;hp=b10fc67b41a2940e3dbc0e70a517c63b60f05987;hpb=d319704a66e9be64da837ccea10af6774c2b0838;p=kivitendo-erp.git
diff --git a/SL/Menu.pm b/SL/Menu.pm
index b10fc67b4..5da42e64a 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -67,8 +67,10 @@ sub menuitem {
}
my $level = $form->escape($item);
- my $str =
- qq|{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
+
+ my $str =
+ qq|{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
+
my @vars = qw(module action target href);
if ($self->{$item}{href}) {
@@ -97,8 +99,46 @@ sub menuitem {
return $str;
}
+sub menuitemNew {
+ my ($self, $myconfig, $form, $item) = @_;
+
+ my $module = $form->{script};
+ my $action = "section_menu";
+
+ #if ($self->{$item}{module}) {
+ $module = $self->{$item}{module};
+
+ #}
+ if ($self->{$item}{action}) {
+ $action = $self->{$item}{action};
+ }
+
+ my $level = $form->escape($item);
+ my $str =
+ qq|$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
+ my @vars = qw(module action target href);
+
+ if ($self->{$item}{href}) {
+ $str = qq|$self->{$item}{href}|;
+ @vars = qw(module target href);
+ }
+
+ map { delete $self->{$item}{$_} } @vars;
+
+ # add other params
+ foreach my $key (keys %{ $self->{$item} }) {
+ $str .= "&" . $form->escape($key, 1) . "=";
+ ($value, $conf) = split /=/, $self->{$item}{$key}, 2;
+ $value = $myconfig->{$value} . "/$conf" if ($conf);
+ $str .= $form->escape($value, 1);
+ }
+
+ $str .= " ";
+
+}
+
sub access_control {
- $main::lxdebug->enter_sub();
+ $main::lxdebug->enter_sub(2);
my ($self, $myconfig, $menulevel) = @_;
@@ -121,10 +161,23 @@ sub access_control {
@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;