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

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index f36cb4b1c..1d9b0accc 100644
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -41,48 +41,54 @@ use SL::Menu;
 
 use CGI::Carp qw(fatalsToBrowser);
 use Encode;
+use URI;
 1;
 
 # end of main
 
 sub display {
-  print $form->create_http_response('content_type' => 'text/xml',
-                                    'charset'      => 'iso-8859-1');
-  print qq|<?xml version="1.0" encoding="iso-8859-1"?>\n|;
-  print qq|<?xml-stylesheet href="xslt/xulmenu.xsl" type="text/xsl"?>\n|;
-  print qq|<!DOCTYPE doc [
-<!ENTITY szlig "ß">
-<!ENTITY auml "ä">
-<!ENTITY uuml "ü">
-<!ENTITY ouml "ö">
-]>|;
-  print qq|<doc>|;
-  print qq|<name>|;
-  print %myconfig->{name};
-  print qq|</name>|;
-  print qq|<db>|;
-  print %myconfig->{dbname};
-  print qq|</db>|;
-  print qq|<favorites>|;
-  my $fav=%myconfig->{favorites};
-  my @favorites = split(/;/, $fav);
+  $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)
+    . qq|<?xml version="1.0" encoding="${charset}"?>
+<?xml-stylesheet href="xslt/xulmenu.xsl" type="text/xsl"?>
+<!DOCTYPE doc [
+<!ENTITY szlig "| . $locale->{iconv_iso8859}->convert('ß') . qq|">
+<!ENTITY auml "| . $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>|;
+
+  my $fav       = $myconfig{favorites};
+  my @favorites = split m/;/, $fav;
   foreach (@favorites) {
-    print qq|<link name="$_"/>|;
+    $text .= qq|<link name="$_"/>|;
   }
-  print qq|</favorites>|;
-  print qq|<menu>|;
-my $isoencodedmenu=&acc_menu($menu);
- print encode("iso-8859-1",$isoencodedmenu );
-
-  print qq|</menu>|;
-  print qq|</doc>|;
-  
+
+  $text .= qq|</favorites>\n|
+    . qq|<menu>\n|
+    . acc_menu()
+    . qq|</menu>\n|
+    . qq|</doc>\n|;
+
+  print $text;
 }
 
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
-
   $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";