X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=28b3a06fac3d1d3cdf2111bf93f764e2c784b89d;hp=198477ce649d751eedf6f9fb4206b40364989a52;hb=27fc2f8819d8f144efc7b131c5824cc73938d06c;hpb=f38f7128e7058d102ac7898e0f06deaf4d1fd538 diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 198477ce6..28b3a06fa 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -5,11 +5,12 @@ 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); +@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable + small_custview myexit); =head1 NAME @@ -43,7 +44,9 @@ Returns an HTML header. =cut sub header { - my($title,$menubar)=@_; + my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc. + #use Carp; + $etc = '' unless defined $etc; my $x = < @@ -51,8 +54,11 @@ sub header { $title + + + - + $title @@ -81,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(); - if ( $cgi->isa('CGI::Base') ) { - no strict 'subs'; - &CGI::Base::SendHeaders; - } else { - print $cgi->header( '-expires' => 'now' ); - } +# my $cgi = &FS::UID::cgi(); +# if ( $cgi->isa('CGI::Base') ) { +# no strict 'subs'; +# &CGI::Base::SendHeaders; +# } else { +# print $cgi->header( @FS::CGI::header ); +# } print < Error processing your request + + +
@@ -116,18 +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"; + 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}) { - eval { - use Apache; + + 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; } @@ -160,9 +195,9 @@ Returns HTML tag for beginning a table. sub table { my $col = shift; if ( $col ) { - qq!!; + qq!
!; } else { - "
"; + '
'; } } @@ -194,11 +229,70 @@ sub ntable { if ( $col ) { qq!
!; } else { - "
"; + '
'; } } +=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT + +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 $cust_main = ref($arg) ? $arg + : qsearchs('cust_main', { 'custnum' => $arg } ) + or die "unknown custnum $arg"; + + my $html = 'Customer #'. $cust_main->custnum. ''. + ntable('#e8e8e8'). '
'. ntable("#cccccc",2). + '
Billing'. + $cust_main->getfield('last'). ', '. $cust_main->first. '
'; + + $html .= $cust_main->company. '
' if $cust_main->company; + $html .= $cust_main->address1. '
'; + $html .= $cust_main->address2. '
' if $cust_main->address2; + $html .= $cust_main->city. ', '. $cust_main->state. ' '. $cust_main->zip. '
'; + $html .= $cust_main->country. '
' + if $cust_main->country && $cust_main->country ne $countrydefault; + + $html .= '
'; + + if ( defined $cust_main->dbdef_table->column('ship_last') ) { + + my $pre = $cust_main->ship_last ? 'ship_' : ''; + + $html .= ''. ntable("#cccccc",2). + 'Service'. + $cust_main->get("${pre}last"). ', '. + $cust_main->get("${pre}first"). '
'; + $html .= $cust_main->get("${pre}company"). '
' + if $cust_main->get("${pre}company"); + $html .= $cust_main->get("${pre}address1"). '
'; + $html .= $cust_main->get("${pre}address2"). '
' + if $cust_main->get("${pre}address2"); + $html .= $cust_main->get("${pre}city"). ', '. + $cust_main->get("${pre}state"). ' '. + $cust_main->get("${pre}ship_zip"). '
'; + $html .= $cust_main->get("${pre}country"). '
' + if $cust_main->get("${pre}country") + && $cust_main->get("${pre}country") ne $countrydefault; + + $html .= ''; + } + + $html .= ''; + + $html; +} + =back =head1 BUGS @@ -207,6 +301,8 @@ Not OO. Not complete. +small_custview sooooo doesn't belong here. i should just switch to Mason. + =head1 SEE ALSO L, L