shipping address additions

[freeside.git] / FS / FS / CGI.pm

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 1e8fca6..6078ad9 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -121,13 +121,11 @@ Sends headers and an HTML error message, then exits.
 =cut
 
 sub eidiot {
-  #warn "eidiot depriciated";
+  warn "eidiot depriciated";
   idiot(@_);
   if (exists $ENV{MOD_PERL}) {
-    eval {
-      use Apache;
-      Apache::exit();
-    };
+    require Apache;
+    Apache::exit();
   } else {
     exit;
   }
@@ -141,8 +139,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);