X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=9dfb8519051b10e69e999b9926d5f2737d975e60;hb=1e7d8e31721d592284644da88b3f03ccce98d10c;hp=8ded1dde8d7d34c9617c0dad9bda49b89f25bb25;hpb=32fa785e63db8d0b0629be988589e89a92986d3e;p=kivitendo-erp.git diff --git a/SL/Menu.pm b/SL/Menu.pm index 8ded1dde8..9dfb85190 100644 --- a/SL/Menu.pm +++ b/SL/Menu.pm @@ -37,6 +37,8 @@ package Menu; use SL::Auth; use SL::Inifile; +use strict; + sub new { $main::lxdebug->enter_sub(); @@ -61,28 +63,61 @@ sub menuitem { my ($self, $myconfig, $form, $item) = @_; + my $module = $self->{$item}{module} || $form->{script}; + my $action = $self->{$item}{action} || "section_menu"; + my $target = $self->{$item}{target} || ""; + + my $level = $form->escape($item); + + my $style = 'style="vertical-align:top"'; + my $target_token = ($target) + ? "target='$target'" : ''; + + my $href = ($self->{$item}{href}) + ? $form->escape($self->{$item}{href}) + : "$module?action=$action&level=$level"; + + my @vars = ($self->{$item}{href}) + ? qw(module target href) + : qw(module action target href); + + map { delete $self->{$item}{$_} } @vars; + + # add other params + foreach my $key (keys %{ $self->{$item} }) { + $href .= "&" . $form->escape($key, 1) . "="; + my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); + $value = $myconfig->{$value} . "/$conf" if ($conf); + $href .= $form->escape($value, 1); + } + + my $str = ""; + + $main::lxdebug->leave_sub(); + + return $str; +} + +sub menuitem_js { + my ($self, $myconfig, $form, $item) = @_; + my $module = $form->{script}; my $action = "section_menu"; - my $target = ""; - if ($self->{$item}{module}) { - $module = $self->{$item}{module}; - } + #if ($self->{$item}{module}) { + $module = $self->{$item}{module}; + + #} if ($self->{$item}{action}) { $action = $self->{$item}{action}; } - if ($self->{$item}{target}) { - $target = $self->{$item}{target}; - } my $level = $form->escape($item); - - my $str = qq|{$item}{href}) { - $str = qq|{$item}{href}|; + $str = qq|$self->{$item}{href}|; @vars = qw(module target href); } @@ -91,20 +126,13 @@ sub menuitem { # add other params foreach my $key (keys %{ $self->{$item} }) { $str .= "&" . $form->escape($key, 1) . "="; - ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); + my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); $value = $myconfig->{$value} . "/$conf" if ($conf); $str .= $form->escape($value, 1); } - if ($target) { - $str .= qq| target=$target|; - } - - $str .= ">"; - - $main::lxdebug->leave_sub(); + $str .= " "; - return $str; } sub menuitem_new { @@ -112,7 +140,8 @@ sub menuitem_new { my ($self, $name, $item) = @_; - my $form = $main::form; + my $form = $main::form; + my $myconfig = \%main::myconfig; my $module = $self->{$name}->{module} || $form->{script}; my $action = $self->{$name}->{action}; @@ -121,7 +150,7 @@ sub menuitem_new { $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; @@ -170,7 +199,7 @@ sub menuitem_v3 { # add other params foreach my $key (keys %{ $self->{$item} }) { $str .= "&" . $form->escape($key, 1) . "="; - ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); + my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); $value = $myconfig->{$value} . "/$conf" if ($conf); $str .= $form->escape($value, 1); } @@ -230,7 +259,7 @@ sub menuitem_XML { # add other params foreach my $key (keys %{ $self->{$item} }) { $str .= "&" . $form->escape($key, 1) . "="; - ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); + my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2); $value = $myconfig->{$value} . "/$conf" if ($conf); $str .= $form->escape($value, 1); } @@ -264,33 +293,9 @@ 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; - - map { $excl{$_} = 1 } @a; - - @a = (); - map { push @a, $_ unless $excl{$_} } (@menu); - $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 { @@ -298,6 +303,10 @@ sub parse_access_string { my $key = shift; my $access = shift; + my $form = $main::form; + my $auth = $main::auth; + my $myconfig = \%main::myconfig; + my @stack; my $cur_ary = []; @@ -318,7 +327,7 @@ sub parse_access_string { } elsif ($token eq ")") { pop @stack; if (!@stack) { - $main::form->error("Error in menu.ini for entry ${key}: missing '('"); + $form->error("Error in menu.ini for entry ${key}: missing '('"); } $cur_ary = $stack[-1]; @@ -326,16 +335,16 @@ sub parse_access_string { push @{$cur_ary}, $token; } else { - push @{$cur_ary}, $main::auth->check_right($main::form->{login}, $token, 1); + push @{$cur_ary}, $auth->check_right($form->{login}, $token, 1); } } if ($access) { - $main::form->error("Error in menu.ini for entry ${name}: unrecognized token at the start of '$access'\n"); + $form->error("Error in menu.ini for entry ${key}: unrecognized token at the start of '$access'\n"); } if (1 < scalar @stack) { - $main::form->error("Error in menu.ini for entry ${name}: Missing ')'\n"); + $main::form->error("Error in menu.ini for entry ${key}: Missing ')'\n"); } return SL::Auth::evaluate_rights_ary($stack[0]); @@ -380,7 +389,10 @@ sub set_access { $self->{ORDER} = [ grep { $self->{$_}->{VISIBLE} } @{ $self->{ORDER} } ]; + { no strict 'refs'; + # ToDO: fix this. nuke and pave algorithm without type checking screams for problems. map { delete @{$self->{$_}}{qw(GRANTED IS_MENU NUM_VISIBLE_CHILDREN VISIBLE ACCESS)} if ($_ ne 'ORDER') } keys %{ $self }; + } } sub dump_visible {