From 4a04e78e1d10f40053407755a2ef3ce25193d87d Mon Sep 17 00:00:00 2001
From: einhverfr <einhverfr@4979c152-3d1c-0410-bac9-87ea11338e46>
Date: Sat, 17 Mar 2007 21:03:39 +0000
Subject: nextsub is now treated the same way as sub, and special handling for
 ->{action}'s starting with ( |.) is removed

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/branches/1.2@930 4979c152-3d1c-0410-bac9-87ea11338e46
---
 LedgerSMB/Form.pm | 4 +++-
 menu.pl           | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 745708e3..59f23b6c 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -65,6 +65,8 @@ sub new {
 	if (substr($self->{action}, 0, 1) !~ /( |\.)/) {
 		$self->{action} = lc $self->{action};
 		$self->{action} =~ s/( |-|,|\#|\/|\.$)/_/g;
+		$self->{nextsub} = lc $self->{nextsub};
+		$self->{nextsub} =~ s/( |-|,|\#|\/|\.$)/_/g;
 	}
 
 	$self->{menubar} = 1 if $self->{path} =~ /lynx/i;
@@ -76,7 +78,7 @@ sub new {
 
 	bless $self, $type;
 
-	if ($self->{action} =~ /:/){
+	if (($self->{action} =~ /:/) || ($self->{nextsub} =~ /:/)){
 		$self->error("Access Denied");
 	}
 	$self;
diff --git a/menu.pl b/menu.pl
index e6a0073a..bf32547b 100755
--- a/menu.pl
+++ b/menu.pl
@@ -137,11 +137,7 @@ if ($form->{action}) {
 
 	&check_password;
 
-	if (substr($form->{action}, 0, 1) =~ /( |\.)/) {
-		&{ $form->{nextsub} };
-	} else {
-		&{ $form->{action} };
-	}
+	&{ $form->{action} };
 
 } else {
 	$form->error(__FILE__.':'.__LINE__.': '.$locale->text('action= not defined!'));
-- 
cgit v1.2.3