import sql-ledger 2.4.4

[freeside.git] / sql-ledger / SL / Menu.pm

diff --git a/sql-ledger/SL/Menu.pm b/sql-ledger/SL/Menu.pm
index 661d354..0df3067 100644 (file)
--- a/sql-ledger/SL/Menu.pm
+++ b/sql-ledger/SL/Menu.pm
@@ -1,6 +1,6 @@
 #=====================================================================
 # SQL-Ledger Accounting
-# Copyright (C) 2001
+# Copyright (C) 2002
 #
 #  Author: Dieter Simader
 #   Email: dsimader@sql-ledger.org
@@ -12,7 +12,7 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -35,13 +35,13 @@ sub new {
   use SL::Inifile;
   my $self = Inifile->new($menufile, $level);
   
-  bless $self, $type;
+  bless $self, $type if $self;
 
 }
 
 
 sub menuitem {
-  my ($self, $myconfig, $form, $item) = @_;
+  my ($self, $myconfig, $form, $item, $level) = @_;
 
   my $module = $form->{script};
   my $action = "section_menu";
@@ -56,9 +56,10 @@ sub menuitem {
   if ($self->{$item}{target}) {
     $target = $self->{$item}{target};
   }
+  
+  $level = $form->escape($item);
+  my $str = qq|<a href=$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&timeout=$form->{timeout}&sessionid=$form->{sessionid}|;
 
-  my $level = $form->escape($item);
-  my $str = qq|<a href=$module?path=$form->{path}&action=$action&level=$level&login=$form->{login}&password=$form->{password}|;
   my @vars = qw(module action target href);
   
   if ($self->{$item}{href}) {
@@ -68,20 +69,23 @@ sub menuitem {
 
   map { delete $self->{$item}{$_} } @vars;
   
-  
+  delete $self->{$item}{submenu};
+ 
   # add other params
   foreach my $key (keys %{ $self->{$item} }) {
-    $str .= "&".$form->escape($key,1)."=";
+    $str .= "&".$form->escape($key)."=";
     ($value, $conf) = split /=/, $self->{$item}{$key}, 2;
     $value = $myconfig->{$value}."/$conf" if ($conf);
-    $str .= $form->escape($value, 1);
+    $str .= $form->escape($value);
   }
 
+  $str .= qq|#id$form->{tag}| if $target eq 'acc_menu';
+  
   if ($target) {
     $str .= qq| target=$target|;
   }
-
-  $str .= ">";
+  
+  $str .= qq|>|;
   
 }