X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=098cdf0ff7286f611103d787a838b98a6324ddd8;hb=f586fedb42ee93caf7923147c9bc70e0331421dd;hp=6aca83f7f926e5febc37edbe91f2a637e8dadb9b;hpb=584e89fb0d4590b4950ae38d392874842e342652;p=freeside.git
diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 6aca83f7f..098cdf0ff 100644
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -6,11 +6,11 @@ use Exporter;
use CGI;
use URI::URL;
#use CGI::Carp qw(fatalsToBrowser);
-use FS::UID;
+use FS::UID qw( cgi );
@ISA = qw(Exporter);
-@EXPORT_OK = qw(header menubar idiot eidiot popurl 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
@@ -61,10 +61,10 @@ sub header {
-
- $title
+
+ $title
-
+
END
$x .= $menubar. "
" if $menubar;
$x;
@@ -78,28 +78,17 @@ 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
- ## 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 );
- }
+ if ( defined $HTML::Mason::Commands::r ) { #Mason + apache
+ if ( $header =~ /^Content-Type$/ ) {
+ $HTML::Mason::Commands::r->content_type($value);
} else {
- die "http_header called in unknown environment";
+ $HTML::Mason::Commands::r->header_out( $header => $value );
}
+ } elsif ( defined $HTML::Mason::Commands::m ) {
+ $HTML::Mason::Commands::m->notes(lc("header-$header"), $value);
} else {
- die "http_header called not running under mod_perl";
+ warn "http_header($header, $value) called with no way to set headers\n";
}
-
}
=item menubar ITEM, URL, ...
@@ -115,6 +104,7 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... );
my($item,$url,@html);
while (@_) {
($item,$url)=splice(@_,0,2);
+ next if $item =~ /^\s*Main\s+Menu\s*$/i;
push @html, qq!$item!;
}
join(' | ',@html);
@@ -185,12 +175,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)";
@@ -205,16 +190,24 @@ sub myexit {
}
}
-=item popurl LEVEL
+=item popurl LEVEL [URL]
-Returns current URL with LEVEL levels of path removed from the end (default 0).
+Returns current (or, optionally, passed) URL with LEVEL levels of path removed
+from the end (default 0).
=cut
sub popurl {
- my($up)=@_;
- my $cgi = &FS::UID::cgi;
- my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ my $up = shift;
+
+ my $url_string;
+ if ( scalar(@_) ) {
+ $url_string = shift;
+ } else {
+ my $cgi = &FS::UID::cgi;
+ $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ }
+
$url_string =~ s/\?.*//;
my $url = new URI::URL ( $url_string );
my(@path)=$url->path_components;
@@ -225,6 +218,41 @@ sub popurl {
$x;
}
+=item rooturl
+
+=cut
+
+sub rooturl {
+ my $url_string;
+ if ( scalar(@_) ) {
+ $url_string = shift;
+ } else {
+ # better to start with the client-provided URL
+ my $cgi = cgi;
+ $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+ }
+
+ $url_string =~ s/\?.*//;
+
+ #even though this is kludgy
+ $url_string =~ s{ / index\.html /? $ }
+ {/}x;
+ $url_string =~
+ s{
+ /
+ (browse|config|docs|edit|graph|misc|search|view|loginout|pref|rt|torrus)
+ (/process)?
+ ([\w\-\.\/]*)
+ $
+ }
+ {}x;
+
+ $url_string .= '/' unless $url_string =~ /\/$/;
+
+ $url_string;
+
+}
+
=item table
Returns HTML tag for beginning a table.
@@ -252,10 +280,11 @@ Returns HTML tag for beginning an (invisible) table.
sub itable {
my $col = shift;
my $cellspacing = shift || 0;
+ my $width = ( scalar(@_) && shift ) ? '' : 'WIDTH="100%"'; #bah
if ( $col ) {
- qq!!;
+ qq!!;
} else {
- qq!!;
+ qq!!;
}
}
@@ -276,69 +305,6 @@ sub ntable {
}
-=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 Address | '.
- $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 Address | '.
- $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 .= '
Balance: $'. $cust_main->balance. '
';
-
- # last payment might be good here too?
-
- $html;
-}
-
=back
=head1 BUGS
@@ -347,8 +313,6 @@ Not OO.
Not complete.
-small_custview sooooo doesn't belong here. i should just switch to Mason.
-
=head1 SEE ALSO
L, L