torrus, RT#10574

[freeside.git] / FS / FS / Mason / Request.pm

diff --git a/FS/FS/Mason/Request.pm b/FS/FS/Mason/Request.pm
index 0a1df87..565f85e 100644 (file)
--- a/FS/FS/Mason/Request.pm
+++ b/FS/FS/Mason/Request.pm
@@ -24,19 +24,31 @@ sub new {
 
     my %opt = @_;
     my $mode = $superclass =~ /Apache/i ? 'apache' : 'standalone';
-    freeside_setup($opt{'comp'}, $mode);
+    $class->freeside_setup($opt{'comp'}, $mode);
 
     $class->SUPER::new(@_);
 
 }
 
+#override alter_superclass ala RT::Interface::Web::Request ??
+# for Mason 1.39 vs. Perl 5.10.0
+
 sub freeside_setup {
+    my( $class, $filename, $mode ) = @_;
 
-    my( $filename, $mode ) = @_;
+    if ( $filename =~ qr(/REST/\d+\.\d+/NoAuth/) ) {
 
-    #warn "initializing for $filename\n";
+      package HTML::Mason::Commands; #?
+      use FS::UID qw( adminsuidsetup );
 
-    if ( $filename !~ /\/rt\/.*NoAuth/ ) { #not RT images/JS
+      #need to log somebody in for the mail gw
+
+      ##old installs w/fs_selfs or selfserv??
+      #&adminsuidsetup('fs_selfservice');
+
+      &adminsuidsetup('fs_queue');
+
+    } else {
 
       package HTML::Mason::Commands;
       use vars qw( $cgi $p $fsurl );
@@ -59,20 +71,16 @@ sub freeside_setup {
         die "unknown mode $mode";
       }
 
-    } elsif ( $filename =~ /\/rt\/REST\/.*NoAuth/ ) {
+  }
 
-      package HTML::Mason::Commands; #?
-      use FS::UID qw( adminsuidsetup );
-
-      #need to log somebody in for the mail gw
-
-      ##old installs w/fs_selfs or selfserv??
-      #&adminsuidsetup('fs_selfservice');
-
-      &adminsuidsetup('fs_queue');
+}
 
-    }
+sub callback {
+  RT::Interface::Web::Request::callback(@_);
+}
 
+sub request_path {
+  RT::Interface::Web::Request::request_path(@_);
 }
 
 1;