kludge around it completely

[freeside.git] / FS / FS / CGI.pm

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 190c0aa..905189e 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -1,7 +1,7 @@
 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;
@@ -10,7 +10,7 @@ use FS::UID;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(header menubar idiot eidiot popurl table itable ntable
-                small_custview myexit);
+                small_custview myexit http_header);
 
 =head1 NAME
 
@@ -44,8 +44,10 @@ Returns an HTML header.
 =cut
 
 sub header {
+  use Carp;
+  carp 'FS::CGI::header deprecated; include /elements/header.html instead';
+
   my($title,$menubar,$etc)=@_; #$etc is for things like onLoad= etc.
-  #use Carp;
   $etc = '' unless defined $etc;
 
   my $x =  <<END;
@@ -68,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.
@@ -75,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);
@@ -177,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);
@@ -193,6 +232,9 @@ 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!<TABLE BGCOLOR="$col" BORDER=1 WIDTH="100%" CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999">!;
@@ -253,7 +295,7 @@ sub small_custview {
 
   my $html = 'Customer #<B>'. $cust_main->custnum. '</B>'.
     ntable('#e8e8e8'). '<TR><TD>'. ntable("#cccccc",2).
-    '<TR><TD ALIGN="right" VALIGN="top">Billing</TD><TD BGCOLOR="#ffffff">'.
+    '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
     $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
 
   $html .= $cust_main->company. '<BR>' if $cust_main->company;
@@ -270,7 +312,7 @@ sub small_custview {
     my $pre = $cust_main->ship_last ? 'ship_' : '';
 
     $html .= '<TD>'. ntable("#cccccc",2).
-      '<TR><TD ALIGN="right" VALIGN="top">Service</TD><TD BGCOLOR="#ffffff">'.
+      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">'.
       $cust_main->get("${pre}last"). ', '.
       $cust_main->get("${pre}first"). '<BR>';
     $html .= $cust_main->get("${pre}company"). '<BR>'
@@ -290,6 +332,10 @@ sub small_custview {
 
   $html .= '</TR></TABLE>';
 
+  $html .= '<BR>Balance: <B>$'. $cust_main->balance. '</B><BR>';
+
+  # last payment might be good here too?
+
   $html;
 }