X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fmenu.pl;h=27643486a7341871a4bee57248df89a9ce630ea9;hb=09fe7f33a735ecc3f4a3112ad716f674983b00cc;hp=3da92a906b0b683553b8bc0429b108073558b641;hpb=d629acd82a27e980899a044ca8b0f4becc8e94bb;p=kivitendo-erp.git

diff --git a/bin/mozilla/menu.pl b/bin/mozilla/menu.pl
index 3da92a906..27643486a 100644
--- a/bin/mozilla/menu.pl
+++ b/bin/mozilla/menu.pl
@@ -35,27 +35,37 @@
 #  2004-12-14 - New Optik - Marco Welter <mawe@linux-studio.de>
 #######################################################################
 
-$menufile = "menu.ini";
+my $menufile = "menu.ini";
 use SL::Menu;
 use Data::Dumper;
+use URI;
+
+use strict;
+
+my $framesize = ($ENV{HTTP_USER_AGENT} =~ /links/i) ? "240" : "190";
+my $mainlevel;
 
 1;
 
 # end of main
 
-$framesize = ($ENV{HTTP_USER_AGENT} =~ /links/i) ? "240" : "190";
-
 sub display {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+
+  my $callback   = $form->unescape($form->{callback});
+  $callback      = URI->new($callback)->rel($callback) if $callback;
+  $callback      = "login.pl?action=company_logo"      if $callback =~ /^(\.\/)?$/;
 
   $form->header;
 
   print qq|
 <frameset rows="28px,*" cols="*" framespacing="0" frameborder="0">
-  <frame  src="kopf.pl?login=$form->{login}&password=$form->{password}" name="kopf"  scrolling="NO">
+  <frame  src="kopf.pl" name="kopf"  scrolling="NO">
   <frameset cols="$framesize,*" framespacing="0" frameborder="0" border="0" >
-    <frame src="$form->{script}?login=$form->{login}&password=$form->{password}&action=acc_menu" name="acc_menu"  scrolling="auto" noresize marginwidth="0">
-    <frame src="login.pl?login=$form->{login}&password=$form->{password}&action=company_logo" name="main_window" scrolling="auto">
+    <frame src="$form->{script}?action=acc_menu" name="acc_menu"  scrolling="auto" noresize marginwidth="0">
+    <frame src="$callback" name="main_window" scrolling="auto">
   </frameset>
   <noframes>
   You need a browser that can read frames to see this page.
@@ -64,17 +74,18 @@ sub display {
 </HTML>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub acc_menu {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;
+
   $mainlevel = $form->{level};
-  $mainlevel =~ s/$mainlevel--//g;
+  $mainlevel =~ s/\Q$mainlevel\E--//g;
   my $menu = new Menu "$menufile";
-  $menu = new Menu "custom_$menufile" if (-f "custom_$menufile");
-  $menu = new Menu "$form->{login}_$menufile"
-    if (-f "$form->{login}_$menufile");
 
   $form->{title} = $locale->text('Accounting Menu');
 
@@ -96,41 +107,48 @@ sub acc_menu {
 </html>
 |;
 
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }
 
 sub section_menu {
-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
   my ($menu, $level) = @_;
 
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  my $zeige;
+
   # build tiered menus
   my @menuorder = $menu->access_control(\%myconfig, $level);
   while (@menuorder) {
-    $item  = shift @menuorder;
-    $label = $item;
-    $ml    = $item;
-    $label =~ s/$level--//g;
+    my $item  = shift @menuorder;
+    my $label = $item;
+    my $ml    = $item;
+    $label =~ s/\Q$level\E--//g;
     $ml    =~ s/--.*//;
     if ($ml eq $mainlevel) { $zeige = 1; }
     else { $zeige = 0; }
     my $spacer = "&nbsp;" x (($item =~ s/--/--/g) * 1);
     $label =~ s/.*--//g;
-    $label_icon = $label . ".gif";
-    $mlab       = $label;
+    my $label_icon = $label . ".gif";
+    my $mlab       = $label;
     $label      = $locale->text($label);
- 
+
     # multi line hack, sschoeling jul06
-    # if a label is too long, try to split it at whitespaces, then join it to chunks of less 
+    # if a label is too long, try to split it at whitespaces, then join it to chunks of less
     # than 20 chars and store it in an array.
     # use this array later instead of the &nbsp;-ed label
-    @chunks = ();
+    my @chunks = ();
     my ($i,$l) = (-1, 20);
     map {
       if (($l += length $_) < 20) {
         $chunks[$i] .= " $_";
-      } else { 
-        $l = length $_; 
-        $chunks[++$i] = $_; 
+      } else {
+        $l = length $_;
+        $chunks[++$i] = $_;
+
       }
     } split / /, $label;
     map { s/ /&nbsp;/ } @chunks;
@@ -141,12 +159,12 @@ sub section_menu {
 
     if ($menu->{$item}{submenu}) {
       $menu->{$item}{$item} = !$form->{$item};
-      if ($form->{level} && $item =~ /^$form->{level}/) {
+      if ($form->{level} && $item =~ /^\Q$form->{level}\E/) {
 
         # expand menu
         if ($zeige) {
           print
-            qq|<tr><td valign=bottom><b>$spacer<img src="image/unterpunkt.png">$label</b></td></tr>\n|;
+            qq|<tr><td style='vertical-align:bottom'><b>$spacer<img src="image/unterpunkt.png">$label</b></td></tr>\n|;
         }
 
         # remove same level items
@@ -201,12 +219,12 @@ sub section_menu {
       } else {
         my $ml_ = $form->escape($ml);
         print
-          qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?action=acc_menu&level=$ml_&login=$form->{login}&password=$form->{password}" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
+          qq|<tr><td class="bg" height="22" align="left" valign="middle" ><img src="image/$item.png" style="vertical-align:middle">&nbsp;<a href="menu.pl?action=acc_menu&level=$ml_" class="nohover">$label</a>&nbsp;&nbsp;&nbsp;&nbsp;</td></tr>\n|;
         &section_menu($menu, $item);
 
         #print qq|<br>\n|;
       }
     }
   }
-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();
 }