projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://lx-office/~/lx-office-erp
[kivitendo-erp.git]
/
bin
/
mozilla
/
menuXML.pl
diff --git
a/bin/mozilla/menuXML.pl
b/bin/mozilla/menuXML.pl
index
0f33b2e
..
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 CGI::Carp qw(fatalsToBrowser);
use Encode;
+use URI;
1;
# end of main
sub display {
1;
# end of main
sub display {
- $locale = Locale->new($
language
, "menu");
+ $locale = Locale->new($
myconfig{countrycode}
, "menu");
my $charset = $dbcharset || 'ISO-8859-1';
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)
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|">
<!DOCTYPE doc [
<!ENTITY szlig "| . $locale->{iconv_iso8859}->convert('ß') . qq|">
<!ENTITY auml "| . $locale->{iconv_iso8859}->convert('ä') . qq|">
-<!ENTITY
u
uml "| . $locale->{iconv_iso8859}->convert('ö') . qq|">
-<!ENTITY
o
uml "| . $locale->{iconv_iso8859}->convert('ü') . qq|">
+<!ENTITY
o
uml "| . $locale->{iconv_iso8859}->convert('ö') . qq|">
+<!ENTITY
u
uml "| . $locale->{iconv_iso8859}->convert('ü') . qq|">
]>
<doc>
<name>$myconfig{name}</name>
]>
<doc>
<name>$myconfig{name}</name>
-
+<version>$form->{version}</version>
+<callback>$callback</callback>
<db>$myconfig{dbname}</db>
<favorites>|;
<db>$myconfig{dbname}</db>
<favorites>|;
@@
-80,8
+85,6
@@
sub display {
. qq|</doc>\n|;
print $text;
. qq|</doc>\n|;
print $text;
-
- $main::lxdebug->message(0, "text $text");
}
}