Fix für Bug 1081. Bei Buchung einer Einkaufsrechnung geht das Rabatt verloren. 1...

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

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index eff12c2..1d9b0ac 100644 (file)
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -41,13 +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});
+  $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)
@@ -56,13 +60,14 @@ sub display {
 <!DOCTYPE doc [
 <!ENTITY szlig "| . $locale->{iconv_iso8859}->convert('ß') . qq|">
 <!ENTITY auml "| . $locale->{iconv_iso8859}->convert('ä') . qq|">
-<!ENTITY uuml "| . $locale->{iconv_iso8859}->convert('ö') . qq|">
-<!ENTITY ouml "| . $locale->{iconv_iso8859}->convert('ü') . qq|">
+<!ENTITY ouml "| . $locale->{iconv_iso8859}->convert('ö') . qq|">
+<!ENTITY uuml "| . $locale->{iconv_iso8859}->convert('ü') . qq|">
 ]>
 
 <doc>
 <name>$myconfig{name}</name>
-
+<version>$form->{version}</version>
+<callback>$callback</callback>
 <db>$myconfig{dbname}</db>
 
 <favorites>|;