Moving menu.pl to old-handler.pl and adjusting top level scripts accordingly.

Including also an unfinished and inactive version of the menu system running under the new architecture.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1334 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 10 insertions, 11 deletions

diff --git a/LedgerSMB/Menu.pm b/LedgerSMB/Menu.pm
index 30aa28c6..5c017a7c 100644
--- a/LedgerSMB/Menu.pm
+++ b/LedgerSMB/Menu.pm
@@ -48,19 +48,18 @@ sub new {
                 my $orig_key = $key;
                 my $ref = $self;
                 while ($key =~ s/^([^-]*)--//){
-                    if (!defined $ref->{$1}){
-                        $ref->{$1} = {};
-                    }
-                    if (!defined $ref->{$1}->{subs}){
-                        $ref->{$1}->{subs} = {};
-                    }
-                    $ref = $ref->{$1}->{subs};
+                    $ref->{subs} ||= {};
+                    $ref->{subs}->{$1} ||= {};
+                    $ref = $ref->{subs}->{$1};
                 }
-                for (keys %{$config->{$orig_key}}){
-                     $ref->{$_} = $config{$orig_key}->{$_};
+                $ref->{subs} ||= {};
+		$ref->{subs}->{key} ||= {};
+                $ref = $ref->{subs}->{$key};
+                for (keys %{$config{$orig_key}}){
+                     $ref->{$_} = ${$config{$orig_key}}{$_};
                 }
-                $ref->{$key}{id} = $index;
-                $ref->{$key}{label} = $key;
+                $ref->{id} = $index;
+                $ref->{label} = $key;
                 ++$index;
             }
         }