SF.net SVN: ledger-smb: [514] trunk

[..hidden..]

Revision: 514
          http://svn.sourceforge.net/ledger-smb/?rev=514&view=rev
Author:   einhverfr
Date:     2006-11-10 21:37:58 -0800 (Fri, 10 Nov 2006)

Log Message:
-----------
Removed exec()'ing redirects

Modified Paths:
--------------
    trunk/LedgerSMB/Form.pm
    trunk/admin.pl
    trunk/bin/menu.pl
    trunk/login.pl
    trunk/menu.pl

Modified: trunk/LedgerSMB/Form.pm
===================================================================
--- trunk/LedgerSMB/Form.pm	2006-11-11 03:37:42 UTC (rev 513)
+++ trunk/LedgerSMB/Form.pm	2006-11-11 05:37:58 UTC (rev 514)
@@ -43,15 +43,18 @@
 
 	my $type = shift;
 
-	my $self = {};
+	my $argstr = shift;
 
 	read(STDIN, $_, $ENV{CONTENT_LENGTH});
 
-	if ($ENV{QUERY_STRING}) {
+	if ($argstr){
+		 $_ = $argstr;
+	}
+	elsif ($ENV{QUERY_STRING}) {
 		$_ = $ENV{QUERY_STRING};
 	}
 
-	if ($ARGV[0]) {
+	elsif ($ARGV[0]) {
 		$_ = $ARGV[0];
 	}
 
@@ -321,11 +324,7 @@
 
 	if ($self->{callback}) {
 
-		my ($script, $argv) = split(/\?/, $self->{callback});
-		$self->error($locale->text("Invalid redirect")) unless
-			first {$_ eq $script} @{LedgerSMB::Sysconfig::scripts};
-		exec ("perl", $script, $argv);
-
+		main::redirect();
 	} else {
 
 		$self->info($msg);

Modified: trunk/admin.pl
===================================================================
--- trunk/admin.pl	2006-11-11 03:37:42 UTC (rev 513)
+++ trunk/admin.pl	2006-11-11 05:37:58 UTC (rev 514)
@@ -49,6 +49,7 @@
 #######################################################################
 
 use LedgerSMB::Sysconfig;
+require "common.pl";
 
 $| = 1;
 

Modified: trunk/bin/menu.pl
===================================================================
--- trunk/bin/menu.pl	2006-11-11 03:37:42 UTC (rev 513)
+++ trunk/bin/menu.pl	2006-11-11 05:37:58 UTC (rev 514)
@@ -56,7 +56,7 @@
 
 		print qq|
 		<frameset cols="$menuwidth,*" border="1">
-			<frame name="acc_menu" src="$form->{script}?login=$form->{login}&amp;sessionid=$form->{sessionid}&amp;action=acc_menu&amp;path=$form->{path}&amp;js=$form->{js}" />
+			<frame name="acc_menu" src="menu.pl?login=$form->{login}&amp;sessionid=$form->{sessionid}&amp;action=acc_menu&amp;path=$form->{path}&amp;js=$form->{js}" />
 			<frame name="main_window" src="am.pl?login=$form->{login}&amp;sessionid=$form->{sessionid}&amp;action=$form->{main}&amp;path=$form->{path}" />
 		</frameset>
 		</html>

Modified: trunk/login.pl
===================================================================
--- trunk/login.pl	2006-11-11 03:37:42 UTC (rev 513)
+++ trunk/login.pl	2006-11-11 05:37:58 UTC (rev 514)
@@ -50,6 +50,7 @@
 #######################################################################
 
 use LedgerSMB::Sysconfig;
+require "common.pl";
 
 $| = 1;
 

Modified: trunk/menu.pl
===================================================================
--- trunk/menu.pl	2006-11-11 03:37:42 UTC (rev 513)
+++ trunk/menu.pl	2006-11-11 05:37:58 UTC (rev 514)
@@ -56,6 +56,7 @@
 use LedgerSMB::Locale;
 use LedgerSMB::Session;
 use Data::Dumper;
+require "common.pl";
 
 
 # for custom preprocessing logic


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