$title

X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=site_perl%2FCGI.pm;h=723d7f4ec0cb9ce1b9b7a60f72e08ff5e151e322;hb=8f4617e35f89b741b8ab5ba9136667b4c877d992;hp=8970b301c25a4f8c68ed2d77ea3addd18401e2da;hpb=51e93bcc017e9355408ff25f232dd9183b62b196;p=freeside.git diff --git a/site_perl/CGI.pm b/site_perl/CGI.pm index 8970b301c..723d7f4ec 100644 --- a/site_perl/CGI.pm +++ b/site_perl/CGI.pm @@ -9,7 +9,7 @@ use CGI::Carp qw(fatalsToBrowser); use FS::UID; @ISA = qw(Exporter); -@EXPORT_OK = qw(header menubar idiot eidiot url); +@EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable); =head1 NAME @@ -17,7 +17,7 @@ FS::CGI - Subroutines for the web interface =head1 SYNOPSIS - use FS::CGI qw(header menubar idiot eidiot url); + use FS::CGI qw(header menubar idiot eidiot popurl); print header( 'Title', '' ); print header( 'Title', menubar('item', 'URL', ... ) ); @@ -25,8 +25,8 @@ FS::CGI - Subroutines for the web interface idiot "error message"; eidiot "error message"; - $url = url; #returns current url - $url = url (3); #three levels up + $url = popurl; #returns current url + $url = popurl(3); #three levels up =head1 DESCRIPTION @@ -45,21 +45,21 @@ Returns an HTML header. sub header { my($title,$menubar)=@_; - < $title - - + + $title

- $menubar -

END + $x .= $menubar. "

" if $menubar; + $x; } =item menubar ITEM, URL, ... @@ -79,18 +79,21 @@ sub menubar { #$menubar=menubar('Main Menu', '../', 'Item', 'url', ... ); =item idiot ERROR +This is depriciated. Don't use it. + Sends headers and 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; + print $cgi->header( '-expires' => 'now' ); } print < @@ -103,7 +106,6 @@ sub idiot { Your request could not be processed because of the following error:

$error -

Hit the Back button in your web browser, correct this mistake, and try again. END @@ -112,29 +114,82 @@ END =item eidiot ERROR +This is depriciated. Don't use it. + Sends headers and an HTML error message, then exits. =cut sub eidiot { + #warn "eidiot depriciated"; idiot(@_); exit; } -=item url LEVEL +=item popurl LEVEL Returns current URL with LEVEL levels of path removed from the end (default 0). =cut -=item url { +sub popurl { my($up)=@_; - my($cgi)=FS::UID::cgi; - my($url)=new URI::URL $cgi; + my($cgi)=&FS::UID::cgi; + my($url)=new URI::URL $cgi->url; my(@path)=$url->path_components; - pop @path foreach ( 1.. $up ); + splice @path, 0-$up; $url->path_components(@path); - $url->as_string; + my $x = $url->as_string; + $x .= '/' unless $x =~ /\/$/; + $x; +} + +=item table + +Returns HTML tag for beginning a table. + +=cut + +sub table { + my $col = shift; + if ( $col ) { + qq!!; + } else { + "
"; + } +} + +=item itable + +Returns HTML tag for beginning an (invisible) table. + +=cut + +sub itable { + my $col = shift; + my $cellspacing = shift || 0; + if ( $col ) { + qq!
!; + } else { + qq!
!; + } +} + +=item ntable + +This is getting silly. + +=cut + +sub ntable { + my $col = shift; + my $cellspacing = shift || 0; + if ( $col ) { + qq!
!; + } else { + "
"; + } + } =back @@ -161,7 +216,32 @@ lose the background, eidiot ivan@sisd.com 98-sep-2 pod ivan@sisd.com 98-sep-12 $Log: CGI.pm,v $ -Revision 1.7 1998-11-09 06:10:59 ivan +Revision 1.17 1999-02-07 09:59:43 ivan +more mod_perl fixes, and bugfixes Peter Wemm sent via email + +Revision 1.16 1999/01/25 12:26:05 ivan +yet more mod_perl stuff + +Revision 1.15 1999/01/18 09:41:48 ivan +all $cgi->header calls now include ( '-expires' => 'now' ) for mod_perl +(good idea anyway) + +Revision 1.14 1999/01/18 09:22:37 ivan +changes to track email addresses for email invoicing + +Revision 1.12 1998/12/23 02:23:16 ivan +popurl always has trailing slash + +Revision 1.11 1998/11/12 07:43:54 ivan +*** empty log message *** + +Revision 1.10 1998/11/12 01:53:47 ivan +added table command + +Revision 1.9 1998/11/09 08:51:49 ivan +bug squash + +Revision 1.7 1998/11/09 06:10:59 ivan added sub url Revision 1.6 1998/11/09 05:44:20 ivan