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/trunk@931 4979c152-3d1c-0410-bac9-87ea11338e46

2 files changed, 4 insertions, 6 deletions

diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 49bc3d7d..05044b99 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!'));