Error processing your request

X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=905189e2e9baf9edc4b7c6a9847042e450bce108;hp=c66bfe3c239ca2ad4fe9c40321a998a1f3c76d41;hb=91ae03f4b1254614ce089dc587cfd7620528384f;hpb=d0f483f47168e01eb6c28e8fc99a62050b245132 diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index c66bfe3c2..905189e2e 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 http_header); =head1 NAME @@ -48,8 +44,10 @@ Returns an HTML header. =cut sub header { - my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc. use Carp; + carp 'FS::CGI::header deprecated; include /elements/header.html instead'; + + my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc. $etc = '' unless defined $etc; my $x = < $title + + + @@ -69,6 +70,38 @@ END $x; } +=item http_header + +Sets an http header. + +=cut + +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 + ## is this the correct pacakge for $r ??? for 1.0x and 1.1x ? + if ( $header =~ /^Content-Type$/ ) { + $HTML::Mason::Commands::r->content_type($value); + } else { + $HTML::Mason::Commands::r->header_out( $header => $value ); + } + } else { + die "http_header called in unknown environment"; + } + } else { + die "http_header called not running under mod_perl"; + } + +} + =item menubar ITEM, URL, ... Returns an HTML menubar. @@ -76,6 +109,9 @@ Returns an HTML menubar. =cut sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... ); + use Carp; + carp 'FS::CGI::menubar deprecated; include /elements/menubar.html instead'; + my($item,$url,@html); while (@_) { ($item,$url)=splice(@_,0,2); @@ -88,24 +124,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 +162,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; } @@ -150,7 +214,9 @@ Returns current URL with LEVEL levels of path removed from the end (default 0). sub popurl { my($up)=@_; my $cgi = &FS::UID::cgi; - my $url = new URI::URL ( $cgi->isa('Apache') ? $cgi->uri : $cgi->url ); + my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + $url_string =~ s/\?.*//; + my $url = new URI::URL ( $url_string ); my(@path)=$url->path_components; splice @path, 0-$up; $url->path_components(@path); @@ -166,11 +232,14 @@ Returns HTML tag for beginning a table. =cut sub table { + use Carp; + carp 'FS::CGI::table deprecated; include /elements/table.html instead'; + my $col = shift; if ( $col ) { - qq!!; + qq!

!; } else { - "

"; + '

'; } } @@ -202,7 +271,7 @@ sub ntable { if ( $col ) { qq!

!; } else { - "

"; + '

'; } } @@ -226,7 +295,7 @@ sub small_custview { my $html = 'Customer #'. $cust_main->custnum. ''. ntable('#e8e8e8'). '

'. ntable("#cccccc",2). - '
Billing	'. + '
Billing Address	'. $cust_main->getfield('last'). ', '. $cust_main->first. ' '; $html .= $cust_main->company. ' ' if $cust_main->company; @@ -243,7 +312,7 @@ sub small_custview { my $pre = $cust_main->ship_last ? 'ship_' : ''; $html .= '	'. ntable("#cccccc",2). - '
Service	'. + '
Service Address	'. $cust_main->get("${pre}last"). ', '. $cust_main->get("${pre}first"). ' '; $html .= $cust_main->get("${pre}company"). ' ' @@ -263,6 +332,10 @@ sub small_custview { $html .= '

'; + $html .= '
Balance: $'. $cust_main->balance. '
'; + + # last payment might be good here too? + $html; }