X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=198477ce649d751eedf6f9fb4206b40364989a52;hp=47c034e133933ed0de652bab33b0e9c7861baaa1;hb=b90f8cdac9371c219a72dda16f8deecc7c44fc28;hpb=cb457f9c0242ea9e7acc80b9aaadd0d1c9bf66a9

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 47c034e13..198477ce6 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -123,9 +123,14 @@ Sends headers and an HTML error message, then exits.
 sub eidiot {
   #warn "eidiot depriciated";
   idiot(@_);
-  #exit;
-  use Apache;
-  Apache::exit;
+  if (exists $ENV{MOD_PERL}) {
+    eval {
+      use Apache;
+      Apache::exit();
+    };
+  } else {
+    exit;
+  }
 }
 
 =item popurl LEVEL
@@ -136,8 +141,8 @@ Returns current URL with LEVEL levels of path removed from the end (default 0).
 
 sub popurl {
   my($up)=@_;
-  my($cgi)=&FS::UID::cgi;
-  my($url)=new URI::URL $cgi->url;
+  my $cgi = &FS::UID::cgi;
+  my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url );
   my(@path)=$url->path_components;
   splice @path, 0-$up;
   $url->path_components(@path);