_store_value() aus Kundenprojekt übernommen.

[kivitendo-erp.git] / SL / Menu.pm

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 5df7089..26e3512 100644 (file)
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -107,6 +107,71 @@ sub menuitem {
   return $str;
 }
 
+sub menuitem_js {
+  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 menuitem_new {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $name, $item) = @_;
+
+  my $form        = $main::form;
+
+  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 {
   $main::lxdebug->enter_sub();
 
@@ -189,7 +254,6 @@ sub menuitem_XML {
 
   my $str = qq| link="$module?action=| . $form->escape($action) .
     qq|&level=| . $form->escape($level);
-  map({ $str .= "&${_}=" . $form->escape($form->{$_}); } qw(login password));
 
   my @vars = qw(module action target href);
 
@@ -224,43 +288,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);
 
@@ -274,33 +301,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 {