X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=28b3a06fac3d1d3cdf2111bf93f764e2c784b89d;hb=a644b239bd83709b67b7b26f4af6e0cc8c172f37;hp=c66bfe3c239ca2ad4fe9c40321a998a1f3c76d41;hpb=d0f483f47168e01eb6c28e8fc99a62050b245132;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index c66bfe3c2..28b3a06fa 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -1,20 +1,16 @@ package FS::CGI; use strict; -use vars qw(@EXPORT_OK @ISA @header); +use vars qw(@EXPORT_OK @ISA); use Exporter; use CGI; use URI::URL; -use CGI::Carp qw(fatalsToBrowser); +#use CGI::Carp qw(fatalsToBrowser); use FS::UID; @ISA = qw(Exporter); @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable - small_custview); - -@header = ( '-Expires' => '-1', - '-Pragma' => 'no-cache', - '-Cache-Control' => 'no-cache' ); + small_custview myexit); =head1 NAME @@ -49,7 +45,7 @@ Returns an HTML header. sub header { my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc. - use Carp; + #use Carp; $etc = '' unless defined $etc; my $x = < $title + + + @@ -88,24 +87,27 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... ); This is depriciated. Don't use it. -Sends headers and an HTML error message. +Sends an HTML error message. =cut sub idiot { #warn "idiot depriciated"; my($error)=@_; - my $cgi = &FS::UID::cgi(); +# my $cgi = &FS::UID::cgi(); # if ( $cgi->isa('CGI::Base') ) { # no strict 'subs'; # &CGI::Base::SendHeaders; # } else { - print $cgi->header( @FS::CGI::header ); +# print $cgi->header( @FS::CGI::header ); # } print < Error processing your request + + +
@@ -123,19 +125,44 @@ END This is depriciated. Don't use it. -Sends headers and an HTML error message, then exits. +Sends an HTML error message, then exits. =cut sub eidiot { warn "eidiot depriciated"; + $HTML::Mason::Commands::r->send_http_header + if defined $HTML::Mason::Commands::r; idiot(@_); + &myexit(); +} + +=item myexit + +You probably shouldn't use this; but if you must: + +If running under mod_perl, calles Apache::exit, otherwise, calls exit. + +=cut + +sub myexit { if (exists $ENV{MOD_PERL}) { - $main::Response->End() - if defined $main::Response - && $main::Response->isa('Apache::ASP::Response'); - require Apache; - Apache::exit(); + + 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 + #$HTML::Mason::Commands::m->flush_buffer(); + $HTML::Mason::Commands::m->abort(); + die "shouldn't fall through to here (mason \$m->abort didn't)"; + } else { + #??? well, it is $ENV{MOD_PERL} + warn "running under unknown mod_perl environment; trying Apache::exit()"; + require Apache; + Apache::exit(); + } } else { exit; } @@ -168,9 +195,9 @@ Returns HTML tag for beginning a table. sub table { my $col = shift; if ( $col ) { - qq!!; + qq!
!; } else { - "
"; + '
'; } } @@ -202,7 +229,7 @@ sub ntable { if ( $col ) { qq!
!; } else { - "
"; + '
'; } }