X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenuv4.pl;h=0420fee3186be9a68a3501dd811b21b317b00b5f;hb=7f8cada2276e50879226ea553006ca7c714fac6a;hp=ffe3e82c975ed9eac4c2d73e354c9fca1e5943b4;hpb=f373f98d676d433b7db20e3e74435a34029cac0f;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuv4.pl b/bin/mozilla/menuv4.pl
index ffe3e82c9..0420fee31 100644
--- a/bin/mozilla/menuv4.pl
+++ b/bin/mozilla/menuv4.pl
@@ -34,6 +34,7 @@
 
 $menufile = "menu.ini";
 use SL::Menu;
+use URI;
 
 1;
 
@@ -42,8 +43,12 @@ use SL::Menu;
 sub display {
   $form->header(qq|<link rel="stylesheet" href="css/menuv4.css?id=" type="text/css">|);
 
-  $form->{date} = clock_line();
-  $form->{menu} = acc_menu();
+  $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 =~ /^(\.\/)?$/;
+  $form->{callback} = $callback;
 
   print $form->parse_html_template("menu/menuv4");
 
@@ -72,7 +77,7 @@ sub clock_line {
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
+  $locale = Locale->new($myconfig{countrycode}, "menu");
 
   $mainlevel = $form->{level};
   $mainlevel =~ s/\Q$mainlevel\E--//g;