projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
287ea32
..
1d9b0ac
100644
(file)
--- 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 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}) || "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)
my $text = $form->create_http_response('content_type' => 'text/xml',
'charset' => $charset)
@@
-63,6
+66,7
@@
sub display {
<doc>
<name>$myconfig{name}</name>
<doc>
<name>$myconfig{name}</name>
+<version>$form->{version}</version>
<callback>$callback</callback>
<db>$myconfig{dbname}</db>
<callback>$callback</callback>
<db>$myconfig{dbname}</db>