X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenuv3.pl;h=121d76df073a4d4489694d9bfa3851f3dc8e06da;hb=d4a434e1deba2695ef4d4a3fc0d51ac1b2044fb0;hp=31aadf9e7a3fa5693c7bd9916106f6c91186d076;hpb=f20785168580f2d3587ebb2d06ade189246fd5f3;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuv3.pl b/bin/mozilla/menuv3.pl
index 31aadf9e7..121d76df0 100644
--- a/bin/mozilla/menuv3.pl
+++ b/bin/mozilla/menuv3.pl
@@ -32,22 +32,25 @@
 #
 #######################################################################
 
-$menufile = "menu.ini";
 use SL::Menu;
 use URI;
 
+use strict;
+
 1;
 
 # end of main
 
 sub display {
-  $form->header(qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
+  my $form     = $main::form;
+
+  $form->header(extra_code => qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
 
   $form->{date}     = clock_line();
   $form->{menu}     = acc_menu();
   my $callback      = $form->unescape($form->{callback});
   $callback         = URI->new($callback)->rel($callback) if $callback;
-  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
+  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
   $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv3");
@@ -77,11 +80,12 @@ sub clock_line {
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
-  $mainlevel = $form->{level};
+  my $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;
-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 
@@ -90,6 +94,10 @@ sub acc_menu {
 
 sub print_menu {
   my ($menu, $parent, $depth) = @_;
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
   my $html;
 
   die if ($depth * 1 > 5);
@@ -105,7 +113,7 @@ sub print_menu {
     next if (($item eq "") || ($item =~ /--/));
 
     my $menu_item = $menu->{"${parent}${item}"};
-    my $menu_title = $locale->text($item);
+    my $menu_title = $::locale->text($item);
     my $menu_text = $menu_title;
 
     my $target = "main_window";