X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/65df2ecc07d76c4714a5548ab6140852bc3abf07..f1b0785501f46f6204ae46cdc9b9ef257b5a216b:/SL/Menu.pm

diff --git a/SL/Menu.pm b/SL/Menu.pm
index b9ee83da0..debceae88 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -58,6 +58,18 @@ sub new {
   return $self;
 }
 
+sub menuitems {
+  my ($self) = @_;
+
+  map {
+    SL::MenuItem->new(
+      name => $_,
+      menu => $self,
+      item => $self->{$_}
+    );
+  } $self->access_control;
+}
+
 sub menuitem {
   $main::lxdebug->enter_sub();
 
@@ -66,47 +78,23 @@ sub menuitem {
   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 $target_token = ($target) ? "target='$target'" : '';
 
-  my $style  = 'style="vertical-align:top"';
-  my $target_token = ($target)
-                   ? "target='$target'"
-                   : '';
-
-#  my $str = qq|<a style="vertical-align:top" href='|;
   my $href = ($self->{$item}{href})
            ? $form->escape($self->{$item}{href})
-           : "$module?action=$action&amp;level=$level";
-
-  my @vars = ($self->{$item}{href})
-           ? qw(module target href)
-           : qw(module action target href);
-
-#  if ($self->{$item}{href}) {
-##    $str  = qq|<a 'href=$self->{$item}{href}|;
-#    @vars = qw(module target href);
-#  }
-
-  map { delete $self->{$item}{$_} } @vars;
+           : "$module?action=$action";
 
   # add other params
   foreach my $key (keys %{ $self->{$item} }) {
+    next if $key =~ /target|module|action/;
     $href .= "&amp;" . $form->escape($key, 1) . "=";
     my ($value, $conf) = split(/=/, $self->{$item}{$key}, 2);
     $value = $myconfig->{$value} . "/$conf" if ($conf);
     $href .= $form->escape($value, 1);
   }
 
-#  $str .= q|'|;
-#
-#  if ($target) {
-#    $str .= qq| target=$target|;
-#  }
-
-#  $str .= ">";
-
-  my $str = "<a href='$href' $target_token $style>";
+  my $str = "<a href='$href' $target_token>";
 
   $main::lxdebug->leave_sub();