X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2FmenuXML.pl;h=1d9b0accc6704bb3bf1c77e324b21238e0d183a8;hb=61ab3c630bf655d54cb44f70f871eed5879f9693;hp=0f8bb5ca2856a82fa2a9c31fe2b8869440d94c4d;hpb=ebceac3e616dc54b1dc5df1586aceb5790201dd0;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index 0f8bb5ca2..1d9b0accc 100644
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -41,14 +41,17 @@ use SL::Menu;
 
 use CGI::Carp qw(fatalsToBrowser);
 use Encode;
+use URI;
 1;
 
 # end of main
 
 sub display {
-  $locale     = Locale->new($language, "menu");
+  $locale     = Locale->new($myconfig{countrycode}, "menu");
   my $charset = $dbcharset || 'ISO-8859-1';
-  my $callback = $form->unescape($form->{callback}) || "login.pl?action=company_logo";
+  my $callback            = $form->unescape($form->{callback});
+  $callback               = URI->new($callback)->rel($callback) if $callback;
+  $callback               = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 
   my $text    = $form->create_http_response('content_type' => 'text/xml',
                                             'charset'      => $charset)