X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenunew.pl;h=6b4f97175a4f371166c1ca8c7bd137f10d694276;hb=cdacfe1cb5156c4bde158f0592d1dd3c445be7dd;hp=25c499f3674ec20c5df15800d1b832646120544f;hpb=32fa785e63db8d0b0629be988589e89a92986d3e;p=kivitendo-erp.git

diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index 25c499f36..6b4f97175 100644
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -34,26 +34,37 @@
 
 use English qw(-no_match_vars);
 use List::Util qw(max);
+use URI;
 
 use SL::Menu;
 
+use strict;
+
 1;
 
 # end of main
 
 sub display {
+  my $form     = $main::form;
+
   $form->header();
 
 #   $form->{force_ul_width} = $ENV{HTTP_USER_AGENT} =~ m/MSIE\s+6\./;
-  $form->{force_ul_width} = $ENV{HTTP_USER_AGENT} !~ m/Opera/;
-#   $form->{force_ul_width} = 1;
+#   $form->{force_ul_width} = $ENV{HTTP_USER_AGENT} !~ m/Opera/;
+  $form->{force_ul_width} = 1;
   $form->{date}           = clock_line();
   $form->{menu_items}     = acc_menu();
+  my $callback            = $form->unescape($form->{callback});
+  $callback               = URI->new($callback)->rel($callback) if $callback;
+  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
+  $form->{callback}       = $callback;
 
   print $form->parse_html_template("menu/menunew");
 }
 
 sub clock_line {
+  my $form     = $main::form;
+
   my ($Sekunden, $Minuten,   $Stunden,   $Monatstag, $Monat,
       $Jahr,     $Wochentag, $Jahrestag, $Sommerzeit)
     = localtime(time);
@@ -76,13 +87,14 @@ sub clock_line {
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
 
   my $mainlevel =  $form->{level};
   $mainlevel    =~ s/\Q$mainlevel\E--//g;
   my $menu      = Menu->new('menu.ini');
 
-  $AUTOFLUSH    =  1;
+  $English::AUTOFLUSH    =  1;
 
   my $all_items = [];
   create_menu($menu, $all_items);
@@ -107,6 +119,9 @@ sub create_menu {
   my ($menu, $all_items, $parent, $depth) = @_;
   my $html;
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
   die if ($depth * 1 > 5);
 
   my @menuorder  = $menu->access_control(\%myconfig, $parent);
@@ -117,7 +132,7 @@ sub create_menu {
     next if (($name eq "") || ($name =~ /--/));
 
     my $menu_item = $menu->{"${parent}${name}"};
-    my $item      = { 'title' => $locale->text($name) };
+    my $item      = { 'title' => $::locale->text($name) };
     push @{ $all_items }, $item;
 
     if ($menu_item->{submenu} || !defined($menu_item->{module}) || ($menu_item->{module} eq "menu.pl")) {