X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=5ac31dbecd3385f2b9a862b454cc8c41fa9195fe;hb=292ef074d01bb925e9a466ed771bf2ac418bb44f;hp=7ad1dc28f71bba658be7398bf90882e8adc24d85;hpb=9a90f2af0663c9b4e9611e044fd25349425d1aec;p=freeside.git

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 7ad1dc28f..5ac31dbec 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -6,7 +6,7 @@ use Exporter;
 use CGI;
 use URI::URL;
 #use CGI::Carp qw(fatalsToBrowser);
-use FS::UID;
+use FS::UID qw( cgi );
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable
@@ -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 = cgi;
+    $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  }
+
   $url_string =~ s/\?.*//;
 
   #even though this is kludgy
@@ -238,10 +244,9 @@ sub rooturl {
   $url_string =~
     s{
        /
-       (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
-       /
-       (process/)?
-       ([\w\-\.\/]+)
+       (browse|config|docs|edit|graph|misc|search|view|loginout|pref|elements|rt|torrus)
+       (/process)?
+       ([\w\-\.\/]*)
        $
      }
      {}x;