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
sub header {
my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
- use Carp;
+ #use Carp;
$etc = '' unless defined $etc;
my $x = <<END;
<TITLE>
$title
</TITLE>
+ <META HTTP-Equiv="Cache-Control" Content="no-cache">
+ <META HTTP-Equiv="Pragma" Content="no-cache">
+ <META HTTP-Equiv="Expires" Content="0">
</HEAD>
<BODY BGCOLOR="#e8e8e8"$etc>
<FONT SIZE=7>
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 <<END;
<HTML>
<HEAD>
<TITLE>Error processing your request</TITLE>
+ <META HTTP-Equiv="Cache-Control" Content="no-cache">
+ <META HTTP-Equiv="Pragma" Content="no-cache">
+ <META HTTP-Equiv="Expires" Content="0">
</HEAD>
<BODY>
<CENTER>
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;
}
sub table {
my $col = shift;
if ( $col ) {
- qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%">!;
+ qq!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">!;
} else {
- "<TABLE BORDER=1>";
+ '<TABLE BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
}
}
if ( $col ) {
qq!<TABLE BGCOLOR="$col" BORDER=0 CELLSPACING=$cellspacing>!;
} else {
- "<TABLE BORDER>";
+ '<TABLE BORDER CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">';
}
}