X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=bin%2Fmozilla%2FmenuXML.pl;h=1eed4edeb9e716a3e16b44042445aec0da26139f;hb=8f09673745acf3c55ad511142dd6b7a85deeebbd;hp=1d9b0accc6704bb3bf1c77e324b21238e0d183a8;hpb=bc71c253714824c3f1bd5749958302dce5555762;p=kivitendo-erp.git

diff --git a/bin/mozilla/menuXML.pl b/bin/mozilla/menuXML.pl
index 1d9b0accc..1eed4edeb 100644
--- a/bin/mozilla/menuXML.pl
+++ b/bin/mozilla/menuXML.pl
@@ -36,19 +36,25 @@
 #  2007-10-14 - XMLified  - Holger Will  <holger@treebuilder.de>
 #######################################################################
 
-$menufile = "menu.ini";
+use utf8;
+
 use SL::Menu;
 
 use CGI::Carp qw(fatalsToBrowser);
 use Encode;
 use URI;
+
+use strict;
+
 1;
 
 # end of main
 
 sub display {
-  $locale     = Locale->new($myconfig{countrycode}, "menu");
-  my $charset = $dbcharset || 'ISO-8859-1';
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  my $charset = $::lx_office_conf{system}->{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 =~ /^(\.\/)?$/;
@@ -58,10 +64,10 @@ sub display {
     . 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|">
+<!ENTITY szlig "| . $::locale->{iconv_utf8}->convert('ß') . qq|">
+<!ENTITY auml "|  . $::locale->{iconv_utf8}->convert('ä') . qq|">
+<!ENTITY ouml "|  . $::locale->{iconv_utf8}->convert('ö') . qq|">
+<!ENTITY uuml "|  . $::locale->{iconv_utf8}->convert('ü') . qq|">
 ]>
 
 <doc>
@@ -89,9 +95,11 @@ sub display {
 
 
 sub acc_menu {
-  $mainlevel = $form->{level};
+  my $form     = $main::form;
+
+  my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 
@@ -102,6 +110,9 @@ sub print_menu {
   my ($menu, $parent, $depth) = @_;
   my $html;
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
   die if ($depth * 1 > 5);
 
   my @menuorder;
@@ -116,7 +127,7 @@ sub print_menu {
     next if (($item eq "") || ($item =~ /--/));
 
     my $menu_item = $menu->{"${parent}${item}"};
-    my $menu_title = $locale->text($item);
+    my $menu_title = $::locale->text($item);
     my $menu_text = $menu_title;
 
     my $target = "main_window";