projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
is.pl: unnötige parse_amounts
[kivitendo-erp.git]
/
bin
/
mozilla
/
menuv3.pl
diff --git
a/bin/mozilla/menuv3.pl
b/bin/mozilla/menuv3.pl
index
43b9fc5
..
683cabf
100644
(file)
--- a/
bin/mozilla/menuv3.pl
+++ b/
bin/mozilla/menuv3.pl
@@
-32,19
+32,29
@@
#
#######################################################################
#
#######################################################################
-$menufile = "menu.ini";
use SL::Menu;
use SL::Menu;
+use URI;
+
+use strict;
+
+my $menufile = "menu.ini";
+my $locale;
1;
# end of main
sub display {
1;
# end of main
sub display {
+ my $form = $main::form;
+
$form->header(qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
$form->{date} = clock_line();
$form->{menu} = acc_menu();
$form->header(qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
$form->{date} = clock_line();
$form->{menu} = acc_menu();
- $form->{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 =~ /^(\.\/)?$/;
+ $form->{callback} = $callback;
print $form->parse_html_template("menu/menuv3");
print $form->parse_html_template("menu/menuv3");
@@
-73,9
+83,12
@@
sub clock_line {
}
sub acc_menu {
}
sub acc_menu {
- $locale = Locale->new($language, "menu");
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
- $mainlevel = $form->{level};
+ $locale = Locale->new($myconfig{countrycode}, "menu");
+
+ my $mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;
my $menu = new Menu "$menufile";
$mainlevel =~ s/\Q$mainlevel\E--//g;
my $menu = new Menu "$menufile";
@@
-86,6
+99,10
@@
sub acc_menu {
sub print_menu {
my ($menu, $parent, $depth) = @_;
sub print_menu {
my ($menu, $parent, $depth) = @_;
+
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
my $html;
die if ($depth * 1 > 5);
my $html;
die if ($depth * 1 > 5);