X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=098cdf0ff7286f611103d787a838b98a6324ddd8;hp=06f740cf5f03c8d7cd075763f7feab1983656be6;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=38a7453130448e067e77fbb6966630bca4cc765b

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 06f740cf5..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 rooturl 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
 
@@ -78,21 +78,17 @@ Sets an http header.
 
 sub http_header {
   my ( $header, $value ) = @_;
-  if (exists $ENV{MOD_PERL}) {
-    if ( 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, ...
@@ -194,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;
@@ -219,9 +223,15 @@ sub popurl {
 =cut
 
 sub rooturl {
-  # better to start with the client-provided URL
-  my $cgi = &FS::UID::cgi;
-  my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url;
+  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
@@ -230,18 +240,13 @@ sub rooturl {
   $url_string =~
     s{
        /
-       (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
-       /
-       (process/)?
-       ([\w\-\.\/]+)
+       (browse|config|docs|edit|graph|misc|search|view|loginout|pref|rt|torrus)
+       (/process)?
+       ([\w\-\.\/]*)
        $
      }
      {}x;
 
-  #elements because of progress-popup.html... 
-  #XXX remove anything from elements that is called directly & prevent
-  #those pages from being served up
-
   $url_string .= '/' unless $url_string =~ /\/$/;
 
   $url_string;
@@ -300,110 +305,6 @@ sub ntable {
 
 }
 
-=item small_custview CUSTNUM || CUST_MAIN_OBJECT, COUNTRYDEFAULT, NOBALANCE_FLAG, URL
-
-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 $nobalance = shift;
-  my $url = shift;
-
-  my $cust_main = ref($arg) ? $arg
-                  : qsearchs('cust_main', { 'custnum' => $arg } )
-    or die "unknown custnum $arg";
-
-  my $html;
-  
-  $html = qq!View <A HREF="$url?! . $cust_main->custnum . '">'
-    if $url;
-
-  $html .= 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
-    ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
-    ucfirst($cust_main->status). '</FONT></B>'.
-    ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
-    '<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;
-  $html .= $cust_main->address1. '<BR>';
-  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
-  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-  $html .= $cust_main->country. '<BR>'
-    if $cust_main->country && $cust_main->country ne $countrydefault;
-
-  $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
-  if ( $cust_main->daytime && $cust_main->night ) {
-    use FS::Msgcat;
-    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
-             ' '. $cust_main->daytime.
-             '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
-             ' '. $cust_main->night;
-  } elsif ( $cust_main->daytime || $cust_main->night ) {
-    $html .= $cust_main->daytime || $cust_main->night;
-  }
-  if ( $cust_main->fax ) {
-    $html .= '<BR>Fax '. $cust_main->fax;
-  }
-
-  $html .= '</TD></TR></TABLE></TD>';
-
-  if ( defined $cust_main->dbdef_table->column('ship_last') ) {
-
-    my $pre = $cust_main->ship_last ? 'ship_' : '';
-
-    $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
-      '<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>'
-      if $cust_main->get("${pre}company");
-    $html .= $cust_main->get("${pre}address1"). '<BR>';
-    $html .= $cust_main->get("${pre}address2"). '<BR>'
-      if $cust_main->get("${pre}address2");
-    $html .= $cust_main->get("${pre}city"). ', '.
-             $cust_main->get("${pre}state"). '  '.
-             $cust_main->get("${pre}zip"). '<BR>';
-    $html .= $cust_main->get("${pre}country"). '<BR>'
-      if $cust_main->get("${pre}country")
-         && $cust_main->get("${pre}country") ne $countrydefault;
-
-    $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
-
-    if ( $cust_main->get("${pre}daytime") && $cust_main->get("${pre}night") ) {
-      use FS::Msgcat;
-      $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
-               ' '. $cust_main->get("${pre}daytime").
-               '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
-               ' '. $cust_main->get("${pre}night");
-    } elsif ( $cust_main->get("${pre}daytime")
-              || $cust_main->get("${pre}night") ) {
-      $html .= $cust_main->get("${pre}daytime")
-               || $cust_main->get("${pre}night");
-    }
-    if ( $cust_main->get("${pre}fax") ) {
-      $html .= '<BR>Fax '. $cust_main->get("${pre}fax");
-    }
-
-    $html .= '</TD></TR></TABLE></TD>';
-  }
-
-  $html .= '</TR></TABLE>';
-
-  $html .= '<BR>Balance: <B>$'. $cust_main->balance. '</B><BR>'
-    unless $nobalance;
-
-  # last payment might be good here too?
-
-  $html;
-}
-
 =back
 
 =head1 BUGS
@@ -412,8 +313,6 @@ Not OO.
 
 Not complete.
 
-small_custview sooooo doesn't belong here.  i should just switch to Mason.
-
 =head1 SEE ALSO
 
 L<CGI>, L<CGI::Base>