[freeside-commits] freeside/FS/FS/Mason Request.pm,1.2,1.3

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/Mason
In directory wavetail.420.am:/tmp/cvs-serv16313/FS/FS/Mason

Modified Files:
	Request.pm 
Log Message:
address root cause of rt/rt links and remove the workarounds, RT#9280

Index: Request.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason/Request.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- Request.pm	3 Jan 2010 03:07:29 -0000	1.2
+++ Request.pm	15 Aug 2010 00:44:54 -0000	1.3
@@ -37,9 +37,19 @@
 
     my( $filename, $mode ) = @_;
 
-    #warn "initializing for $filename\n";
+    if ( $filename =~ qr(/REST/\d+\.\d+/NoAuth/) ) {
 
-    if ( $filename !~ /\/rt\/.*NoAuth/ ) { #not RT images/JS
+      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');
+
+    } else {
 
       package HTML::Mason::Commands;
       use vars qw( $cgi $p $fsurl );
@@ -62,18 +72,6 @@
         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');
-
     }
 
 }