X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=9dfb8519051b10e69e999b9926d5f2737d975e60;hb=f521b94b94cbd7364006304546fc54c6815a48e2;hp=7abab0d6a432f8aa7eb157fa5aef39123892ada3;hpb=d46070343706247c7365968e4ab7783aec361c03;p=kivitendo-erp.git

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 7abab0d6a..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 = "<a href='$href' $target_token $style>";
+
+  $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|<a style="vertical-align:top" href=$module?action=$action&level=$level|;
-
-  my @vars = qw(module action target href);
+  my $str   = qq|$module?action=$action&level=$level|;
+  my @vars  = qw(module action target href);
 
   if ($self->{$item}{href}) {
-    $str  = qq|<a href=$self->{$item}{href}|;
+    $str  = qq|$self->{$item}{href}|;
     @vars = qw(module target href);
   }
 
@@ -91,20 +126,42 @@ 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 .= " ";
 
-  $str .= ">";
+}
 
-  $main::lxdebug->leave_sub();
+sub menuitem_new {
+  $main::lxdebug->enter_sub();
 
-  return $str;
+  my ($self, $name, $item) = @_;
+
+  my $form        =  $main::form;
+  my $myconfig    = \%main::myconfig;
+
+  my $module      = $self->{$name}->{module} || $form->{script};
+  my $action      = $self->{$name}->{action};
+
+  $item->{target} = $self->{$name}->{target} || "main_window";
+  $item->{href}   = $self->{$name}->{href}   || "${module}?action=" . $form->escape($action);
+
+  my @vars = qw(module target href);
+  push @vars, 'action' unless ($self->{$name}->{href});
+
+  map { delete $self->{$name}{$_} } @vars;
+
+  # add other params
+  foreach my $key (keys %{ $self->{$name} }) {
+    my ($value, $conf)  = split(m/=/, $self->{$name}->{$key}, 2);
+    $value              = $myconfig->{$value} . "/$conf" if ($conf);
+    $item->{href}      .= "&" . $form->escape($key) . "=" . $form->escape($value);
+  }
+
+  $main::lxdebug->leave_sub();
 }
 
 sub menuitem_v3 {
@@ -142,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);
   }
@@ -202,7 +259,7 @@ sub menuitem_XML {
   # add other params
   foreach my $key (keys %{ $self->{$item} }) {
     $str .= "&amp;" . $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);
   }
@@ -223,43 +280,6 @@ sub menuitem_XML {
   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?action=$action&level=$level|;
-  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(2);
 
@@ -273,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 {
@@ -307,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 = [];
 
@@ -327,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];
 
@@ -335,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]);
@@ -389,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 {