X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=ab35fed1a48bfc108ece19b371c6be7ba34186c2;hb=debd14edcc23a6168e827be861a052f396aee901;hp=7d07153bc1125c927c9c0adce71745f1260aa4e6;hpb=f559ec45ea2fc09c361ef7e4a40a59b1f2133737;p=kivitendo-erp.git

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 7d07153bc..ab35fed1a 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -34,8 +34,11 @@
 
 package Menu;
 
+use SL::Auth;
 use SL::Inifile;
 
+use strict;
+
 sub new {
   $main::lxdebug->enter_sub();
 
@@ -46,9 +49,13 @@ sub new {
 
   map { $self->{$_} = $inifile->{$_} } keys %{ $inifile };
 
+  bless $self, $type;
+
+  $self->set_access();
+
   $main::lxdebug->leave_sub();
 
-  bless $self, $type;
+  return $self;
 }
 
 sub menuitem {
@@ -56,29 +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&login=$form->{login}&password=$form->{password}|;
-
-  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);
   }
 
@@ -87,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 {
@@ -124,9 +185,7 @@ sub menuitem_v3 {
 
   my $level = $form->escape($item);
 
-  my $str = qq|<a href="$module?action=| . $form->escape($action) .
-    qq|&level=| . $form->escape($level);
-  map({ $str .= "&${_}=" . $form->escape($form->{$_}); } qw(login password));
+  my $str = qq|<a href="$module?action=| . $form->escape($action) . qq|&level=| . $form->escape($level);
 
   my @vars = qw(module action target href);
 
@@ -140,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);
   }
@@ -187,7 +246,6 @@ sub menuitem_XML {
 
   my $str = qq| link="$module?action=| . $form->escape($action) .
     qq|&amp;level=| . $form->escape($level);
-  map({ $str .= "&amp;${_}=" . $form->escape($form->{$_}); } qw(login password));
 
   my @vars = qw(module action target href);
 
@@ -201,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);
   }
@@ -222,83 +280,126 @@ sub menuitem_XML {
   return $str;
 }
 
-sub menuitemNew {
-  my ($self, $myconfig, $form, $item) = @_;
+sub access_control {
+  $main::lxdebug->enter_sub(2);
 
-  my $module = $form->{script};
-  my $action = "section_menu";
+  my ($self, $myconfig, $menulevel) = @_;
 
-  #if ($self->{$item}{module}) {
-  $module = $self->{$item}{module};
+  my @menu = ();
 
-  #}
-  if ($self->{$item}{action}) {
-    $action = $self->{$item}{action};
+  if ($menulevel eq "") {
+    @menu = grep { !/--/ } @{ $self->{ORDER} };
+  } else {
+    @menu = grep { /^${menulevel}--/ } @{ $self->{ORDER} };
   }
 
-  my $level = $form->escape($item);
-  my $str   =
-    qq|$module?action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
-  my @vars = qw(module action target href);
+  $main::lxdebug->leave_sub(2);
 
-  if ($self->{$item}{href}) {
-    $str  = qq|$self->{$item}{href}|;
-    @vars = qw(module target href);
-  }
+  return @menu;
+}
 
-  map { delete $self->{$item}{$_} } @vars;
+sub parse_access_string {
+  my $self   = shift;
+  my $key    = shift;
+  my $access = shift;
 
-  # 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);
+  my $form        =  $main::form;
+  my $auth        =  $main::auth;
+  my $myconfig    = \%main::myconfig;
+
+  my @stack;
+  my $cur_ary = [];
+
+  push @stack, $cur_ary;
+
+  while ($access =~ m/^([a-z_]+|\||\&|\(|\)|\s+)/) {
+    my $token = $1;
+    substr($access, 0, length($1)) = "";
+
+    next if ($token =~ /\s/);
+
+    if ($token eq "(") {
+      my $new_cur_ary = [];
+      push @stack, $new_cur_ary;
+      push @{$cur_ary}, $new_cur_ary;
+      $cur_ary = $new_cur_ary;
+
+    } elsif ($token eq ")") {
+      pop @stack;
+      if (!@stack) {
+        $form->error("Error in menu.ini for entry ${key}: missing '('");
+      }
+      $cur_ary = $stack[-1];
+
+    } elsif (($token eq "|") || ($token eq "&")) {
+      push @{$cur_ary}, $token;
+
+    } else {
+      push @{$cur_ary}, $auth->check_right($form->{login}, $token, 1);
+    }
   }
 
-  $str .= " ";
+  if ($access) {
+    $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 ${key}: Missing ')'\n");
+  }
 
+  return SL::Auth::evaluate_rights_ary($stack[0]);
 }
 
-sub access_control {
-  $main::lxdebug->enter_sub(2);
+sub set_access {
+  my $self = shift;
 
-  my ($self, $myconfig, $menulevel) = @_;
+  my $key;
 
-  my @menu = ();
+  foreach $key (@{ $self->{ORDER} }) {
+    my $entry = $self->{$key};
 
-  if ($menulevel eq "") {
-    @menu = grep { !/--/ } @{ $self->{ORDER} };
-  } else {
-    @menu = grep { /^${menulevel}--/ } @{ $self->{ORDER} };
-  }
+    $entry->{GRANTED}              = $entry->{ACCESS} ? $self->parse_access_string($key, $entry->{ACCESS}) : 1;
+    $entry->{IS_MENU}              = $entry->{submenu} || ($key !~ m/--/);
+    $entry->{NUM_VISIBLE_CHILDREN} = 0;
 
-  my @a    = split(/;/, $myconfig->{acs});
-  my $excl = ();
+    if ($key =~ m/--/) {
+      my $parent = $key;
+      substr($parent, rindex($parent, '--')) = '';
+      $entry->{GRANTED} &&= $self->{$parent}->{GRANTED};
+    }
 
-  # remove --AR, --AP from array
-  grep { ($a, $b) = split(/--/); s/--$a$//; } @a;
+    $entry->{VISIBLE} = $entry->{GRANTED};
+  }
 
-  map { $excl{$_} = 1 } @a;
+  foreach $key (reverse @{ $self->{ORDER} }) {
+    my $entry = $self->{$key};
 
-  @a = ();
-  map { push @a, $_ unless $excl{$_} } (@menu);
+    if ($entry->{IS_MENU}) {
+      $entry->{VISIBLE} &&= $entry->{NUM_VISIBLE_CHILDREN} > 0;
+    }
 
-  $main::lxdebug->leave_sub(2);
+    next if (($key !~ m/--/) || !$entry->{VISIBLE});
 
-  return @a;
-}
+    my $parent = $key;
+    substr($parent, rindex($parent, '--')) = '';
+    $self->{$parent}->{NUM_VISIBLE_CHILDREN}++;
+  }
 
-sub generate_acl {
-  my ($self, $menulevel, $hash) = @_;
+#   $self->dump_visible();
 
-  my @items = $self->access_control(\%main::myconfig, $menulevel);
+  $self->{ORDER} = [ grep { $self->{$_}->{VISIBLE} } @{ $self->{ORDER} } ];
 
-  $menulevel =~ s/[^A-Za-z_\/\.\+\-]/_/g;
-  $hash->{"access_" . lc($menulevel)} = 1 if ($menulevel);
+  { 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 };
+  }
+}
 
-  foreach my $item (@items) {
-    $self->generate_acl($item, $hash); #unless ($menulevel);
+sub dump_visible {
+  my $self = shift;
+  foreach my $key (@{ $self->{ORDER} }) {
+    my $entry = $self->{$key};
+    $main::lxdebug->message(0, "$entry->{GRANTED} $entry->{VISIBLE} $entry->{NUM_VISIBLE_CHILDREN} $key");
   }
 }