projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Vorlagenname werden in Zukunft nicht mehr _master.html als Postfix haben
[kivitendo-erp.git]
/
bin
/
mozilla
/
menunew.pl
diff --git
a/bin/mozilla/menunew.pl
b/bin/mozilla/menunew.pl
index
b48abc8
..
793cec2
100644
(file)
--- a/
bin/mozilla/menunew.pl
+++ b/
bin/mozilla/menunew.pl
@@
-38,11
+38,17
@@
use URI;
use SL::Menu;
use SL::Menu;
+use strict;
+
+my $locale;
+
1;
# end of main
sub display {
1;
# end of main
sub display {
+ my $form = $main::form;
+
$form->header();
# $form->{force_ul_width} = $ENV{HTTP_USER_AGENT} =~ m/MSIE\s+6\./;
$form->header();
# $form->{force_ul_width} = $ENV{HTTP_USER_AGENT} =~ m/MSIE\s+6\./;
@@
-52,13
+58,15
@@
sub display {
$form->{menu_items} = acc_menu();
my $callback = $form->unescape($form->{callback});
$callback = URI->new($callback)->rel($callback) if $callback;
$form->{menu_items} = acc_menu();
my $callback = $form->unescape($form->{callback});
$callback = URI->new($callback)->rel($callback) if $callback;
- $callback = "login.pl?action=company_logo" if $callback =~ /^(.\/)?$/;
+ $callback = "login.pl?action=company_logo" if $callback =~ /^(
\
.\/)?$/;
$form->{callback} = $callback;
print $form->parse_html_template("menu/menunew");
}
sub clock_line {
$form->{callback} = $callback;
print $form->parse_html_template("menu/menunew");
}
sub clock_line {
+ my $form = $main::form;
+
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat,
$Jahr, $Wochentag, $Jahrestag, $Sommerzeit)
= localtime(time);
my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat,
$Jahr, $Wochentag, $Jahrestag, $Sommerzeit)
= localtime(time);
@@
-81,13
+89,15
@@
sub clock_line {
}
sub acc_menu {
}
sub acc_menu {
- $locale = Locale->new($language, "menu");
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+ $locale = Locale->new($myconfig{countrycode}, "menu");
my $mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;
my $menu = Menu->new('menu.ini');
my $mainlevel = $form->{level};
$mainlevel =~ s/\Q$mainlevel\E--//g;
my $menu = Menu->new('menu.ini');
- $AUTOFLUSH = 1;
+ $
English::
AUTOFLUSH = 1;
my $all_items = [];
create_menu($menu, $all_items);
my $all_items = [];
create_menu($menu, $all_items);
@@
-112,6
+122,9
@@
sub create_menu {
my ($menu, $all_items, $parent, $depth) = @_;
my $html;
my ($menu, $all_items, $parent, $depth) = @_;
my $html;
+ my $form = $main::form;
+ my %myconfig = %main::myconfig;
+
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);
die if ($depth * 1 > 5);
my @menuorder = $menu->access_control(\%myconfig, $parent);