From 1702ffad58949ebe9e4769afeb9fe9c93249cf69 Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 1 Jun 2010 19:58:28 +0000 Subject: add progressbar, redirection, and improve links RT#8274 --- FS/FS/CGI.pm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'FS/FS/CGI.pm') diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index f33a718..9454784 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -227,9 +227,15 @@ sub popurl { =cut sub rooturl { - # better to start with the client-provided URL - my $cgi = &FS::UID::cgi; - my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + my $url_string; + if ( scalar(@_) ) { + $url_string = shift; + } else { + # better to start with the client-provided URL + my $cgi = &FS::UID::cgi; + $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + } + $url_string =~ s/\?.*//; #even though this is kludgy -- cgit v1.1