projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bei Loginfehlern das MenĂ¼ nicht mitrendern
[kivitendo-erp.git]
/
bin
/
mozilla
/
menuv3.pl
diff --git
a/bin/mozilla/menuv3.pl
b/bin/mozilla/menuv3.pl
index
43b9fc5
..
121d76d
100644
(file)
--- a/
bin/mozilla/menuv3.pl
+++ b/
bin/mozilla/menuv3.pl
@@
-32,19
+32,26
@@
#
#######################################################################
#
#######################################################################
-$menufile = "menu.ini";
use SL::Menu;
use SL::Menu;
+use URI;
+
+use strict;
1;
# end of main
sub display {
1;
# end of main
sub display {
- $form->header(qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
+ my $form = $main::form;
+
+ $form->header(extra_code => qq|<link rel="stylesheet" href="css/menuv3.css?id=" type="text/css">|);
$form->{date} = clock_line();
$form->{menu} = acc_menu();
$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,11
+80,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};
+
my
$mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;
$mainlevel =~ s/\Q$mainlevel\E--//g;
- my $menu =
new Menu "$menufile"
;
+ my $menu =
Menu->new("menu.ini")
;
$| = 1;
$| = 1;
@@
-86,6
+94,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);
@@
-101,7
+113,7
@@
sub print_menu {
next if (($item eq "") || ($item =~ /--/));
my $menu_item = $menu->{"${parent}${item}"};
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";
my $menu_text = $menu_title;
my $target = "main_window";