add a key on ( history_action, $primary_key ) to the h_ tables. this should speed...

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

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 15561d7..06f740c 100644 (file)
--- a/FS/FS/CGI.pm
+++ b/FS/FS/CGI.pm
@@ -230,7 +230,7 @@ sub rooturl {
   $url_string =~
     s{
        /
-       (browse|config|docs|edit|graph|misc|search|view|pref|rt)
+       (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
        /
        (process/)?
        ([\w\-\.\/]+)
@@ -238,6 +238,10 @@ sub rooturl {
      }
      {}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;
@@ -321,7 +325,7 @@ sub small_custview {
     if $url;
 
   $html .= 'Customer #<B>'. $cust_main->custnum. '</B></A>'.
-    ' - <B><FONT COLOR="'. $cust_main->statuscolor. '">'.
+    ' - <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">'.
@@ -365,7 +369,7 @@ sub small_custview {
       if $cust_main->get("${pre}address2");
     $html .= $cust_main->get("${pre}city"). ', '.
              $cust_main->get("${pre}state"). '  '.
-             $cust_main->get("${pre}ship_zip"). '<BR>';
+             $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;