X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenujs.pl;h=ef7b2b817f45d232d5878b711c559fc419fc5815;hb=5c3437e5b742d646d573f3c52fb68de010e7cdd0;hp=6e5b433883fd1b32e16b3293772b010651363060;hpb=84d90a036bc1638f752061d2da80cb5d6e3842cb;p=kivitendo-erp.git diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl index 6e5b43388..ef7b2b817 100644 --- a/bin/mozilla/menujs.pl +++ b/bin/mozilla/menujs.pl @@ -35,16 +35,25 @@ # 2004-12-14 - Holger Lindemann ####################################################################### -$menufile = "menu.ini"; +my $menufile = "menu.ini"; use SL::Menu; use CGI::Carp qw(fatalsToBrowser); +use strict; + +my $locale; + 1; # end of main sub display { + my $form = $main::form; + + $form->{callback} = $form->unescape($form->{callback}); + $form->{callback} ||= "login.pl?action=company_logo"; + $form->header; &clock_line; @@ -52,7 +61,7 @@ sub display { &acc_menu; print qq| - @@ -65,10 +74,12 @@ sub display { sub clock_line { - $fensterlink="menujs.pl?action=display"; - $fenster = "["."neues Fenster]"; + my $form = $main::form; - $login = "[Nutzer " + my $fensterlink="menujs.pl?action=display"; + my $fenster = "["."neues Fenster]"; + + my $login = "[Nutzer " . $form->{login} . " - " . $locale->text('Logout') @@ -88,14 +99,14 @@ sub clock_line { "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"); - $datum = + my $datum = $Wochentage[$Wochentag] . ", der " . $Monatstag . "." . $Monat . "." . $Jahr . " - "; #$zeit="
".$Stunden.":".$Minuten.":".$Sekunden."
"; - $zeit = "
" . $Stunden . ":" . $Minuten . "
"; + my $zeit = "
" . $Stunden . ":" . $Minuten . "
"; print qq| @@ -351,7 +366,7 @@ function moveRoot() { |; print qq| - + |; } @@ -359,16 +374,20 @@ function moveRoot() { sub section_menu { my ($menu, $level) = @_; + my $form = $main::form; + my %myconfig = %main::myconfig; + # build tiered menus my @menuorder = $menu->access_control(\%myconfig, $level); - $main = 0; + my $main = 0; #$pm=0; - $shlp=0; + my $shlp=0; + my (%mlz, $sm, $z, $pm, $mm); while (@menuorder) { - $item = shift @menuorder; - $label = $item; - $ml = $item; + my $item = shift @menuorder; + my $label = $item; + my $ml = $item; $label =~ s/$level--//g; $ml =~ s/--.*//; $label = $locale->text($label); @@ -379,12 +398,12 @@ sub section_menu { $menu->{$item}{$item} = !$form->{$item}; # Untermen - if ($mlz{"s$ml"} > 1) { - $z++; - $sm = 1; - } else { - $z = $sm; - $mlz{"s$ml"}++; + if ($mlz{"s$ml"} > 1) { + $z++; + $sm = 1; + } else { + $z = $sm; + $mlz{"s$ml"}++; } print qq|menu[$mlz{$ml}][$z] = new Item('$label', '#', '', defLength, 0, | @@ -401,8 +420,8 @@ sub section_menu { if ($menu->{$item}{module}) { #Untermenüpunkte - $target = $menu->{$item}{target}; - $uri = $menu->menuitem_js(\%myconfig, \%$form, $item, $level); + my $target = $menu->{$item}{target}; + my $uri = $menu->menuitem_js(\%myconfig, \%$form, $item, $level); print qq|menu[$pm][$sm] = new Item('$label', '$uri', '$target', defLength, 0, 0);\n|; @@ -414,9 +433,9 @@ sub section_menu { %mlz = ($ml, $pm, "s$ml", 1); $shlp = $sm; $sm = 1; - $breit = 15 + length($label) * 6; + my $breit = 15 + length($label) * 6; print - qq|menu[0][$mm] = new Item(' $label', '#', '', $breit, 10, $pm); \n|; + qq|menu[0][$mm] = new Item(' $label', '#', '', $breit, 10, $pm); \n|; print qq|menu[$pm] = new Array();\n|; print qq|menu[$pm][0] = new Menu(true, '>', 0, 20, 180, defOver, defBack, 'itemBorder', 'itemText');\n|;