This commit was generated by cvs2svn to compensate for changes in r6252,

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

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index a85d48a..38a869c 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -79,14 +79,7 @@ Sets an http header.
 sub http_header {
   my ( $header, $value ) = @_;
   if (exists $ENV{MOD_PERL}) {
-    if ( defined $main::Response
-         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
-      if ( $header =~ /^Content-Type$/ ) {
-        $main::Response->{ContentType} = $value;
-      } else {
-        $main::Response->AddHeader( $header => $value );
-      }
-    } elsif ( defined $HTML::Mason::Commands::r  ) { #Mason
+    if ( defined $HTML::Mason::Commands::r  ) { #Mason
       ## is this the correct pacakge for $r ???  for 1.0x and 1.1x ?
       if ( $header =~ /^Content-Type$/ ) {
         $HTML::Mason::Commands::r->content_type($value);
@@ -186,12 +179,7 @@ If running under mod_perl, calles Apache::exit, otherwise, calls exit.
 sub myexit {
   if (exists $ENV{MOD_PERL}) {
 
-    if ( defined $main::Response
-         && $main::Response->isa('Apache::ASP::Response') ) {  #Apache::ASP
-      $main::Response->End();
-      require Apache;
-      Apache::exit();
-    } elsif ( defined $HTML::Mason::Commands::m  ) { #Mason
+    if ( defined $HTML::Mason::Commands::m  ) { #Mason
       #$HTML::Mason::Commands::m->flush_buffer();
       $HTML::Mason::Commands::m->abort();
       die "shouldn't fall through to here (mason \$m->abort didn't)";
@@ -237,10 +225,12 @@ sub rooturl {
   $url_string =~ s/\?.*//;
 
   #even though this is kludgy
+  $url_string =~ s{ / index\.html /? $ }
+                  {/}x;
   $url_string =~
     s{
        /
-       (browse|config|docs|edit|graph|misc|search|view|pref|rt)
+       (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
        /
        (process/)?
        ([\w\-\.\/]+)
@@ -248,6 +238,10 @@ sub rooturl {
      }
      {}x;
 
+  #elements because of progress-popup.html... 
+  #XXX remove anything from elements that is called directly & prevent
+  #those pages from being served up
+
   $url_string .= '/' unless $url_string =~ /\/$/;
 
   $url_string;
@@ -331,7 +325,7 @@ sub small_custview {
     if $url;
 
   $html .= 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
-    ' - <B><FONT COLOR="'. $cust_main->statuscolor. '">'.
+    ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
     ucfirst($cust_main->status). '</FONT></B>'.
     ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
     '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.