X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=bef5242667c02080a643f4b76919254f24f01445;hb=9b3c19f327c600ad9bd08a373176b1cf100dbd61;hp=9459412eac6b2b6f2d665d3022aad38ece595415;hpb=4dbb09950c9f5596646537c12d991c99086fe7c1;p=kivitendo-erp.git
diff --git a/SL/Menu.pm b/SL/Menu.pm
index 9459412ea..bef524266 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -18,7 +18,7 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -34,7 +34,6 @@
package Menu;
-
sub new {
$main::lxdebug->enter_sub();
@@ -42,13 +41,12 @@ sub new {
use SL::Inifile;
my $self = Inifile->new($menufile, $level);
-
+
$main::lxdebug->leave_sub();
bless $self, $type;
}
-
sub menuitem {
$main::lxdebug->enter_sub();
@@ -69,22 +67,24 @@ 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}) {
- $str = qq|{$item}{href}|;
+ $str = qq|{$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)."=";
+ $str .= "&" . $form->escape($key, 1) . "=";
($value, $conf) = split /=/, $self->{$item}{$key}, 2;
- $value = $myconfig->{$value}."/$conf" if ($conf);
+ $value = $myconfig->{$value} . "/$conf" if ($conf);
$str .= $form->escape($value, 1);
}
@@ -99,12 +99,49 @@ 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) = @_;
-
+
my @menu = ();
if ($menulevel eq "") {
@@ -114,21 +151,30 @@ sub access_control {
}
my @a = split /;/, $myconfig->{acs};
- my $excl = ();
-
- # remove --AR, --AP from array
- grep { ($a, $b) = split /--/; s/--$a$//; } @a;
+ 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;