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

diff --git a/bin/mozilla/menunew.pl b/bin/mozilla/menunew.pl
index 25c499f36..777c38c8a 100644
--- a/bin/mozilla/menunew.pl
+++ b/bin/mozilla/menunew.pl
@@ -34,6 +34,7 @@
 
 use English qw(-no_match_vars);
 use List::Util qw(max);
+use URI;
 
 use SL::Menu;
 
@@ -45,10 +46,14 @@ sub display {
   $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");
 }
@@ -76,7 +81,7 @@ sub clock_line {
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
+  $locale = Locale->new($myconfig{countrycode}, "menu");
 
   my $mainlevel =  $form->{level};
   $mainlevel    =~ s/\Q$mainlevel\E--//g;