SF.net SVN: ledger-smb: [930] branches/1.2

[..hidden..]

Revision: 930
          http://svn.sourceforge.net/ledger-smb/?rev=930&view=rev
Author:   einhverfr
Date:     2007-03-17 14:03:39 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
nextsub is now treated the same way as sub, and special handling for ->{action}'s starting with ( |.) is removed

Modified Paths:
--------------
    branches/1.2/LedgerSMB/Form.pm
    branches/1.2/menu.pl

Modified: branches/1.2/LedgerSMB/Form.pm
===================================================================
--- branches/1.2/LedgerSMB/Form.pm	2007-03-17 20:40:07 UTC (rev 929)
+++ branches/1.2/LedgerSMB/Form.pm	2007-03-17 21:03:39 UTC (rev 930)
@@ -65,6 +65,8 @@
 	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 @@
 
 	bless $self, $type;
 
-	if ($self->{action} =~ /:/){
+	if (($self->{action} =~ /:/) || ($self->{nextsub} =~ /:/)){
 		$self->error("Access Denied");
 	}
 	$self;

Modified: branches/1.2/menu.pl
===================================================================
--- branches/1.2/menu.pl	2007-03-17 20:40:07 UTC (rev 929)
+++ branches/1.2/menu.pl	2007-03-17 21:03:39 UTC (rev 930)
@@ -137,11 +137,7 @@
 
 	&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!'));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.