X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=96047f667faf46143a8c48b75b9221fa853f5ed3;hb=c545a57d21341c49674defed65a4243f07b5ebaf;hp=c91c01fd080f8643cdf6f688ff99c9565138a5b4;hpb=e81089e14bf8bd59c9dee9e70763df902962fb2b;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index c91c01fd0..96047f667 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -9,8 +9,8 @@ use URI::URL; use FS::UID; @ISA = qw(Exporter); -@EXPORT_OK = qw(header menubar idiot eidiot popurl rooturl table itable ntable - small_custview myexit http_header); +@EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable + myexit http_header); =head1 NAME @@ -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)"; @@ -242,7 +230,7 @@ sub rooturl { $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\-\.\/]+) @@ -250,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; @@ -308,110 +300,6 @@ sub ntable { } -=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG, URL - -Sheesh. I should just switch to Mason. - -=cut - -sub small_custview { - use FS::Record qw(qsearchs); - use FS::cust_main; - - my $arg = shift; - my $countrydefault = shift || 'US'; - my $nobalance = shift; - my $url = shift; - - my $cust_main = ref($arg) ? $arg - : qsearchs('cust_main', { 'custnum' => $arg } ) - or die "unknown custnum $arg"; - - my $html; - - $html = qq!View ' - if $url; - - $html .= 'Customer #'. $cust_main->custnum. ''. - ' - '. - ucfirst($cust_main->status). ''. - ntable('#e8e8e8'). '