$title

X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=098cdf0ff7286f611103d787a838b98a6324ddd8;hp=198477ce649d751eedf6f9fb4206b40364989a52;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=f38f7128e7058d102ac7898e0f06deaf4d1fd538 diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index 198477ce6..098cdf0ff 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 FS::UID; +#use CGI::Carp qw(fatalsToBrowser); +use FS::UID qw( cgi ); @ISA = qw(Exporter); -@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable); +@EXPORT_OK = qw( header menubar idiot eidiot popurl rooturl table itable ntable + myexit http_header); =head1 NAME @@ -43,7 +44,11 @@ Returns an HTML header. =cut sub header { - my($title,$menubar)=@_; + 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 = < @@ -51,17 +56,41 @@ sub header { $title + + + - - - $title + + + $title -

+
END $x .= $menubar. "

" if $menubar; $x; } +=item http_header + +Sets an http header. + +=cut + +sub http_header { + my ( $header, $value ) = @_; + if ( defined $HTML::Mason::Commands::r ) { #Mason + apache + if ( $header =~ /^Content-Type$/ ) { + $HTML::Mason::Commands::r->content_type($value); + } else { + $HTML::Mason::Commands::r->header_out( $header => $value ); + } + } elsif ( defined $HTML::Mason::Commands::m ) { + $HTML::Mason::Commands::m->notes(lc("header-$header"), $value); + } else { + warn "http_header($header, $value) called with no way to set headers\n"; + } +} + =item menubar ITEM, URL, ... Returns an HTML menubar. @@ -69,9 +98,13 @@ 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); + next if $item =~ /^\s*Main\s+Menu\s*$/i; push @html, qq!$item!; } join(' | ',@html); @@ -81,24 +114,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,33 +152,64 @@ 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 $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; } } -=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 = new URI::URL ( $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; splice @path, 0-$up; $url->path_components(@path); @@ -151,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. @@ -158,11 +260,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 { - "

"; + '

'; } } @@ -175,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!

!; } } @@ -194,7 +300,7 @@ sub ntable { if ( $col ) { qq!

!; } else { - "

"; + '

'; } }