X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenujs.pl;h=54637216c00b0c30748e41159472dfcfc3857dbe;hb=8a2d9daf01083e1271cf6118591bb2c242734261;hp=37e083c738afa69e593aeb52eafae690a263b073;hpb=91e45c035d896c80b7405a037ded84fc89e28c5a;p=kivitendo-erp.git

diff --git a/bin/mozilla/menujs.pl b/bin/mozilla/menujs.pl
index 37e083c73..54637216c 100644
--- a/bin/mozilla/menujs.pl
+++ b/bin/mozilla/menujs.pl
@@ -35,7 +35,9 @@
 #  2004-12-14 - Holger Lindemann
 #######################################################################
 
-$menufile = "menu.ini";
+use utf8;
+use strict;
+
 use SL::Menu;
 use CGI::Carp qw(fatalsToBrowser);
 
@@ -45,6 +47,11 @@ use CGI::Carp qw(fatalsToBrowser);
 
 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 +59,7 @@ sub display {
   &acc_menu;
 
   print qq|
-<iframe id="win1" src="login.pl?login=$form->{login}&password=$form->{password}&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,15 +72,15 @@ sub display {
 
 sub clock_line {
 
-  $fensterlink="menujs.pl?login=$form->{login}&password=$form->{password}&action=display";
-  $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
+  my $form     = $main::form;
 
-  $login = "[Nutzer "
+  my $fensterlink="menujs.pl?action=display";
+  my $fenster = "["."<a href=\"$fensterlink\" target=\"_blank\">neues Fenster</a>]";
+
+  my $login = "[Nutzer "
     . $form->{login}
-    . " - <a href=\"login.pl?password="
-    . $form->{"password"}
-    . "&action=logout\" target=\"_top\">"
-    . $locale->text('Logout')
+    . " - <a href=\"login.pl?action=logout\" target=\"_top\">"
+    . $::locale->text('Logout')
     . "</a>] ";
   my ($Sekunden, $Minuten,   $Stunden,   $Monatstag, $Monat,
       $Jahr,     $Wochentag, $Jahrestag, $Sommerzeit)
@@ -90,14 +97,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">
 <!--
@@ -123,10 +130,13 @@ window.onload=clockon
 }
 
 sub acc_menu {
-  $locale = Locale->new($language, "menu");
-  $mainlevel = $form->{level};
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+
+  my $mainlevel = $form->{level};
   $mainlevel =~ s/$mainlevel--//g;
-  my $menu = new Menu "$menufile";
+  my $menu = Menu->new("menu.ini");
 
   $| = 1;
 
@@ -162,158 +172,158 @@ 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") ;
 var KO = ((navigator.userAgent.indexOf('Opera',0) != -1) \|\| (navigator.userAgent.indexOf('Konqueror',0) != -1));
 function getRef(id) {
-	if (isDOM) return document.getElementById(id);
-	if (isIE4) return document.all[id];
-	if (isNS4) return document.layers[id];
+  if (isDOM) return document.getElementById(id);
+  if (isIE4) return document.all[id];
+  if (isNS4) return document.layers[id];
 }
 function getSty(id) {
-	return (isNS4 ? getRef(id) : getRef(id).style);
-} 
+  return (isNS4 ? getRef(id) : getRef(id).style);
+}
 var popTimer = 0;
 var litNow = new Array();
 function popOver(menuNum, itemNum) {
-	if (KO) document.getElementById("win1").style.visibility = "hidden";
-	clearTimeout(popTimer);
-	hideAllBut(menuNum);
-	litNow = getTree(menuNum, itemNum);
-	changeCol(litNow, true);
-	targetNum = menu[menuNum][itemNum].target;
-	if (targetNum > 0) {
-		thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left);
-		thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top);
-		with (menu[targetNum][0].ref) {
-			left = parseInt(thisX + menu[targetNum][0].x);
-			top = parseInt(thisY + menu[targetNum][0].y);
-			visibility = 'visible';
-		}
-	}
+  if (KO) document.getElementById("win1").style.visibility = "hidden";
+  clearTimeout(popTimer);
+  hideAllBut(menuNum);
+  litNow = getTree(menuNum, itemNum);
+  changeCol(litNow, true);
+  targetNum = menu[menuNum][itemNum].target;
+  if (targetNum > 0) {
+    thisX = parseInt(menu[menuNum][0].ref.left) + parseInt(menu[menuNum][itemNum].ref.left);
+    thisY = parseInt(menu[menuNum][0].ref.top) + parseInt(menu[menuNum][itemNum].ref.top);
+    with (menu[targetNum][0].ref) {
+      left = parseInt(thisX + menu[targetNum][0].x);
+      top = parseInt(thisY + menu[targetNum][0].y);
+      visibility = 'visible';
+    }
+  }
 }
 function popOut(menuNum, itemNum) {
-	if ((menuNum == 0) && !menu[menuNum][itemNum].target)
-		hideAllBut(0)
-		if (KO) document.getElementById("win1").style.visibility = "visible";
-	else
-		popTimer = setTimeout('hideAllBut(0)', 500);
+  if ((menuNum == 0) && !menu[menuNum][itemNum].target)
+    hideAllBut(0)
+    if (KO) document.getElementById("win1").style.visibility = "visible";
+  else
+    popTimer = setTimeout('hideAllBut(0)', 500);
 }
 function getTree(menuNum, itemNum) {
-	itemArray = new Array(menu.length);
-	while(1) {
-		itemArray[menuNum] = itemNum;
-		if (menuNum == 0) return itemArray;
-		itemNum = menu[menuNum][0].parentItem;
-		menuNum = menu[menuNum][0].parentMenu;
-	}
+  itemArray = new Array(menu.length);
+  while(1) {
+    itemArray[menuNum] = itemNum;
+    if (menuNum == 0) return itemArray;
+    itemNum = menu[menuNum][0].parentItem;
+    menuNum = menu[menuNum][0].parentMenu;
+  }
 }
 function changeCol(changeArray, isOver) {
-	for (menuCount = 0; menuCount < changeArray.length; menuCount++) {
-		if (changeArray[menuCount]) {
-			newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol;
-			with (menu[menuCount][changeArray[menuCount]].ref) {
-				if (isNS4) bgColor = newCol;
-				else backgroundColor = newCol;
-			}
-		}
-	}
+  for (menuCount = 0; menuCount < changeArray.length; menuCount++) {
+    if (changeArray[menuCount]) {
+      newCol = isOver ? menu[menuCount][0].overCol : menu[menuCount][0].backCol;
+      with (menu[menuCount][changeArray[menuCount]].ref) {
+        if (isNS4) bgColor = newCol;
+        else backgroundColor = newCol;
+      }
+    }
+  }
 }
 function hideAllBut(menuNum) {
-	var keepMenus = getTree(menuNum, 1);
-	for (count = 0; count < menu.length; count++)
-		if (!keepMenus[count])
-			menu[count][0].ref.visibility = 'hidden';
-	changeCol(litNow, false);
+  var keepMenus = getTree(menuNum, 1);
+  for (count = 0; count < menu.length; count++)
+    if (!keepMenus[count])
+      menu[count][0].ref.visibility = 'hidden';
+  changeCol(litNow, false);
 }
 
 function Menu(isVert, popInd, x, y, width, overCol, backCol, borderClass, textClass) {
-	this.isVert = isVert;
-	this.popInd = popInd
-	this.x = x;
-	this.y = y;
-	this.width = width;
-	this.overCol = overCol;
-	this.backCol = backCol;
-	this.borderClass = borderClass;
-	this.textClass = textClass;
-	this.parentMenu = null;
-	this.parentItem = null;
-	this.ref = null;
+  this.isVert = isVert;
+  this.popInd = popInd
+  this.x = x;
+  this.y = y;
+  this.width = width;
+  this.overCol = overCol;
+  this.backCol = backCol;
+  this.borderClass = borderClass;
+  this.textClass = textClass;
+  this.parentMenu = null;
+  this.parentItem = null;
+  this.ref = null;
 }
 function Item(text, href, frame, length, spacing, target) {
-	this.text = text;
-	this.href = href;
-	this.frame = frame;
-	this.length = length;
-	this.spacing = spacing;
-	this.target = target;
-	this.ref = null;
+  this.text = text;
+  this.href = href;
+  this.frame = frame;
+  this.length = length;
+  this.spacing = spacing;
+  this.target = target;
+  this.ref = null;
 }
 function go(link,frame) {
-	tmp=eval("top."+frame);
-	tmp.location=link;
+  tmp=eval("top."+frame);
+  tmp.location=link;
         //top.main_window.location=link;
 }
 function writeMenus() {
-	if (!isDOM && !isIE4 && !isNS4) return;
-	for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) {
-		var str = '', itemX = 0, itemY = 0;
-		for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) {
-			var itemID = 'menu' + currMenu + 'item' + currItem;
-			var w = (isVert ? width : length);
-			var h = (isVert ? length : width);
-			if (isDOM \|\| isIE4) {
-				str += '<div id="' + itemID + '" style="position: absolute; left: ' + itemX + '; top: ' + itemY + '; width: ' + w + '; height: ' + h + '; visibility: inherit; ';
-				if (backCol) str += 'background: ' + backCol + '; ';
-				str += '" ';
-			}
-			if (isNS4) {
-				str += '<layer id="' + itemID + '" left="' + itemX + '" top="' + itemY + '" width="' +  w + '" height="' + h + '" visibility="inherit" ';
-				if (backCol) str += 'bgcolor="' + backCol + '" ';
-			}
-			if (borderClass) str += 'class="' + borderClass + '" "';
-			str += 'onMouseOver="popOver(' + currMenu + ',' + currItem + ')" onMouseOut="popOut(' + currMenu + ',' + currItem + ')">';
-			str += '<table width="' + (w - 8) + '" border="0" cellspacing="0" cellpadding="' + (!isNS4 && borderClass ? 3 : 0) + '">';
-			str +='<tr><td class="' + textClass + '" style="cursor:pointer;" align="left" height="' + (h - 7) + '" onClick=\\'go("' + href + '","' + frame + '")\\'>' + text + '</a></td>';
-			if (target > 0) {
-				menu[target][0].parentMenu = currMenu;
-				menu[target][0].parentItem = currItem;
-				if (popInd) str += '<td class="' + textClass + '" align="right">' + popInd + '</td>';
-			}
-			str += '</tr></table>' + (isNS4 ? '</layer>' : '</div>');
-			if (isVert) itemY += length + spacing;
-			else itemX += length + spacing;
-		}
-		if (isDOM) {
-			var newDiv = document.createElement('div');
-			document.getElementsByTagName('body').item(0).appendChild(newDiv);
-			newDiv.innerHTML = str;
-			ref = newDiv.style;
-			ref.position = 'absolute';
-			ref.visibility = 'hidden';
-		}
-		if (isIE4) {
-			document.body.insertAdjacentHTML('beforeEnd', '<div id="menu' + currMenu + 'div" ' + 'style="position: absolute; visibility: hidden">' + str + '</div>');
-			ref = getSty('menu' + currMenu + 'div');
-		}
-		if (isNS4) {
-			ref = new Layer(0);
-			ref.document.write(str);
-			ref.document.close();
-		}
-		for (currItem = 1; currItem < menu[currMenu].length; currItem++) {
-			itemName = 'menu' + currMenu + 'item' + currItem;
-			if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName);
-			if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName];
-		}
-	}
-	with(menu[0][0]) {
-		ref.left = x;
-		ref.top = y;
-		ref.visibility = 'visible';
+  if (!isDOM && !isIE4 && !isNS4) return;
+  for (currMenu = 0; currMenu < menu.length; currMenu++) with (menu[currMenu][0]) {
+    var str = '', itemX = 0, itemY = 0;
+    for (currItem = 1; currItem < menu[currMenu].length; currItem++) with (menu[currMenu][currItem]) {
+      var itemID = 'menu' + currMenu + 'item' + currItem;
+      var w = (isVert ? width : length);
+      var h = (isVert ? length : width);
+      if (isDOM \|\| isIE4) {
+        str += '<div id="' + itemID + '" style="position: absolute; left: ' + itemX + '; top: ' + itemY + '; width: ' + w + '; height: ' + h + '; visibility: inherit; ';
+        if (backCol) str += 'background: ' + backCol + '; ';
+        str += '" ';
+      }
+      if (isNS4) {
+        str += '<layer id="' + itemID + '" left="' + itemX + '" top="' + itemY + '" width="' +  w + '" height="' + h + '" visibility="inherit" ';
+        if (backCol) str += 'bgcolor="' + backCol + '" ';
+      }
+      if (borderClass) str += 'class="' + borderClass + '" "';
+      str += 'onMouseOver="popOver(' + currMenu + ',' + currItem + ')" onMouseOut="popOut(' + currMenu + ',' + currItem + ')">';
+      str += '<table width="' + (w - 8) + '" border="0" cellspacing="0" cellpadding="' + (!isNS4 && borderClass ? 3 : 0) + '">';
+      str +='<tr><td class="' + textClass + '" style="cursor:pointer;" align="left" height="' + (h - 7) + '" onClick=\\'go("' + href + '","' + frame + '")\\'>' + text + '</a></td>';
+      if (target > 0) {
+        menu[target][0].parentMenu = currMenu;
+        menu[target][0].parentItem = currItem;
+        if (popInd) str += '<td class="' + textClass + '" align="right">' + popInd + '</td>';
+      }
+      str += '</tr></table>' + (isNS4 ? '</layer>' : '</div>');
+      if (isVert) itemY += length + spacing;
+      else itemX += length + spacing;
+    }
+    if (isDOM) {
+      var newDiv = document.createElement('div');
+      document.getElementsByTagName('body').item(0).appendChild(newDiv);
+      newDiv.innerHTML = str;
+      ref = newDiv.style;
+      ref.position = 'absolute';
+      ref.visibility = 'hidden';
+    }
+    if (isIE4) {
+      document.body.insertAdjacentHTML('beforeEnd', '<div id="menu' + currMenu + 'div" ' + 'style="position: absolute; visibility: hidden">' + str + '</div>');
+      ref = getSty('menu' + currMenu + 'div');
+    }
+    if (isNS4) {
+      ref = new Layer(0);
+      ref.document.write(str);
+      ref.document.close();
+    }
+    for (currItem = 1; currItem < menu[currMenu].length; currItem++) {
+      itemName = 'menu' + currMenu + 'item' + currItem;
+      if (isDOM \|\| isIE4) menu[currMenu][currItem].ref = getSty(itemName);
+      if (isNS4) menu[currMenu][currItem].ref = ref.document[itemName];
+    }
+  }
+  with(menu[0][0]) {
+    ref.left = x;
+    ref.top = y;
+    ref.visibility = 'visible';
    }
 }
 var menu = new Array();
@@ -333,12 +343,12 @@ nsResizeHandler = new Function('if (popOldWidth != window.innerWidth) location.r
 if (isNS4) document.captureEvents(Event.CLICK);
 document.onclick = clickHandle;
 function clickHandle(evt) {
-	if (isNS4) document.routeEvent(evt);
-	hideAllBut(0);
-	if (KO) document.getElementById("win1").style.visibility = "visible";
+  if (isNS4) document.routeEvent(evt);
+  hideAllBut(0);
+  if (KO) document.getElementById("win1").style.visibility = "visible";
 }
 function moveRoot() {
-	with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5);
+  with(menu[0][0].ref) left = ((parseInt(left) < 100) ? 100 : 5);
 }
 //  End -->
 </script>
@@ -353,7 +363,7 @@ function moveRoot() {
 |;
 
   print qq|
-  
+
 |;
 
 }
@@ -361,19 +371,23 @@ 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);
+    $label = $::locale->text($label);
     $label =~ s/ /&nbsp;/g;
     $menu->{$item}{target} = "main_window" unless $menu->{$item}{target};
 
@@ -381,12 +395,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, |
@@ -402,9 +416,9 @@ sub section_menu {
     } else {
       if ($menu->{$item}{module}) {
 
-        #Untermenüpunkte
-        $target = $menu->{$item}{target};
-        $uri    = $menu->menuitem_js(\%myconfig, \%$form, $item, $level);
+        #Untermenüpunkte
+        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|;
@@ -416,9 +430,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|;