X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenujs.pl;h=f4455d606a818f73a7702176d77794f7ee24ee48;hb=a2777d1ab70c9789131e9ad966f94a4ddf301bd2;hp=6e5b433883fd1b32e16b3293772b010651363060;hpb=84d90a036bc1638f752061d2da80cb5d6e3842cb;p=kivitendo-erp.git

diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl
index 6e5b43388..f4455d606 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|
-<iframe id="win1" src="login.pl?action=company_logo" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;">
+<iframe id="win1" src="$form->{callback}" width="100%" height="93%" name="main_window" style="position: absolute; border:0px;">
 <p>Ihr Browser kann leider keine eingebetteten Frames anzeigen.
 </p>
 </iframe>
@@ -65,10 +74,12 @@ sub display {
 
 sub clock_line {
 
-  $fensterlink="menujs.pl?action=display";
-  $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
+  my $form     = $main::form;
+
+  my $fensterlink="menujs.pl?action=display";
+  my $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
 
-  $login = "[Nutzer "
+  my $login = "[Nutzer "
     . $form->{login}
     . " - <a href=\"login.pl?action=logout\" target=\"_top\">"
     . $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="<div id='Uhr'>".$Stunden.":".$Minuten.":".$Sekunden."</div>";
-  $zeit = "<div id='Uhr'>" . $Stunden . ":" . $Minuten . "</div>";
+  my $zeit = "<div id='Uhr'>" . $Stunden . ":" . $Minuten . "</div>";
   print qq|
 <script type="text/javascript">
 <!--
@@ -121,8 +132,12 @@ window.onload=clockon
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
-  $mainlevel = $form->{level};
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  $locale = Locale->new($myconfig{countrycode}, "menu");
+  my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
   my $menu = new Menu "$menufile";
 
@@ -160,7 +175,7 @@ sub acc_menu {
 
 <script type="text/javascript">
 <!--
-var isDOM = (document.getElementById ? true : false); 
+var isDOM = (document.getElementById ? true : false);
 var isIE4 = ((document.all && !isDOM) ? true : false);
 var isNS4 = (document.layers ? true : false);
 //var KO = (navigator.appName=="Konqueror" \|\| navigator.appName=="Opera") ;
@@ -172,7 +187,7 @@ function getRef(id) {
 }
 function getSty(id) {
 	return (isNS4 ? getRef(id) : getRef(id).style);
-} 
+}
 var popTimer = 0;
 var litNow = new Array();
 function popOver(menuNum, itemNum) {
@@ -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,7 +433,7 @@ 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|;
         print qq|menu[$pm] = new Array();\n|;