Merge branch 'rb-wiederkehrende-rechnungen' into after-262

[kivitendo-erp.git] / bin / mozilla / menuv4.pl

diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl
index 0ff4f4b..ae82d45 100644 (file)
--- a/bin/mozilla/menuv4.pl
+++ b/bin/mozilla/menuv4.pl
@@ -32,25 +32,25 @@
 #
 #######################################################################
 
-$menufile = "menu.ini";
 use SL::Menu;
 use URI;
 
+use strict;
+
 1;
 
 # end of main
 
 sub display {
+  my $form     = $main::form;
+
   $form->header(qq|<link rel="stylesheet" href="css/menuv4.css?id=" type="text/css">|);
 
   $form->{date}     = clock_line();
   $form->{menu}     = acc_menu();
   my $callback      = $form->unescape($form->{callback});
-  $main::lxdebug->message(0, ">>>>>  $callback");
   $callback         = URI->new($callback)->rel($callback) if $callback;
-  $main::lxdebug->message(0, ">>>>>  $callback");
-  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(.\/)?$/;
-  $main::lxdebug->message(0, ">>>>>  $callback");
+  $callback         = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
   $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv4");
@@ -58,6 +58,8 @@ sub display {
 }
 
 sub clock_line {
+  my $form     = $main::form;
+
   my ($Sekunden, $Minuten,   $Stunden,   $Monatstag, $Monat,
       $Jahr,     $Wochentag, $Jahrestag, $Sommerzeit)
     = localtime(time);
@@ -80,11 +82,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;
 
@@ -93,6 +96,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);
@@ -108,7 +115,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";