bulk checkin from working on the road:

- use msgcat for more error messages - should be all things that would come3
  back from the signup server normally now
- signup server: don't display access number <SELECT> if there's none or one
- signup_server-realtime config option to run billing for signup server
  signups immediately
- signup server: pkg available to success templates, better documentation on
  success templates
- httemplate/edit/msgcat.cgi fields are properly sticky on errors
- httemplate/edit/process/msgcat.cgi - don't update identical fields

5 files changed, 20 insertions, 23 deletions

diff --git a/httemplate/browse/msgcat.cgi b/httemplate/browse/msgcat.cgi
index 774473b36..d4adf9f1a 100755
--- a/httemplate/browse/msgcat.cgi
+++ b/httemplate/browse/msgcat.cgi
@@ -1,7 +1,7 @@
 <!-- mason kludge -->
 <%
 
-print header("Message catalog", menubar(
+print header("View Message catalog", menubar(
   'Main Menu' => $p,
   'Edit message catalog' => $p. "edit/msgcat.cgi",
 )), '<BR>';
diff --git a/httemplate/docs/signup.html b/httemplate/docs/signup.html
index 117cf2947..5168f47d6 100644
--- a/httemplate/docs/signup.html
+++ b/httemplate/docs/signup.html
@@ -35,28 +35,22 @@ Then:
 </ul>
 Optional:
 <ul>
-  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
+  <li>If you create a <b>/usr/local/freeside/ieak.template</b> file on the external machine, it will be sent to IE users with MIME type <i>application/x-Internet-signup</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/ieak.template</b>)  See the <a href="http://www.microsoft.com/windows/ieak/techinfo/deploy/60/en/toc.asp">IEAK documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the following variables available:
-  <ul>
-    <li>$ac - area code of selected POP
-    <li>$exch - exchange of selected POP
-    <li>$loc - local part of selected POP
-    <li>$username
-    <li>$password
-    <li>$email_name - first and last name
-  </ul>
+  <li>If you create a <b>/usr/local/freeside/cck.template</b> file on the external machine, the variables defined will be sent to Netscape users with MIME type <i>application/x-netscape-autoconfigure-dialer-v2</i>.  This file will be processed with <a href="http://search.cpan.org/doc/MJD/Text-Template-1.23/Template.pm">Text::Template</a> with the variables listed below available.
   (an example file is included as <b>fs_signup/cck.template</b>).  See the <a href="http://help.netscape.com/products/client/mc/acctproc4.html">Netscape documentation</a> for more information.
-  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
   <li>If you create a <b>/usr/local/freeside/success.html</b> file on the external machine, it will be used as the success HTML page.  Although template substiutions are available, a regular HTML file will work fine here, unlike signup.html.  An example file is included as <b>fs_signup/FS-SignupClient/cgi/success.html</b>
+  <li>Variable substitutions available in <b>ieak.template</b>, <b>cck.template</b> and <b>success.html</b>:
+    <ul>
+      <li>$ac - area code of selected POP
+      <li>$exch - exchange of selected POP
+      <li>$loc - local part of selected POP
+      <li>$username
+      <li>$password
+      <li>$email_name - first and last name
+      <li>$pkg - package name
+    </ul>
+  <li>If you create a <b>/usr/local/freeside/signup.html</b> file on the external machine, it will be used as a template for the form HTML.  This requires the template to be constructed appropriately; probably best to start with the example file included as <b>fs_signup/FS-SignupClient/cgi/signup.html</b>.
   <li>If there are any entries in the <i>prepay_credit</i> table, a user can enter a string matching the <b>identifier</i> column to receive the credit specified in the <b>amount</b> column, and/or the time specified in the <b>seconds</b> column (for use with the <a href="session.html">session monitor</a>), after which that <b>identifier</b> is no longer valid.  This can be used to implement pre-paid "calling card" type signups.  The <i>bin/generate-prepay</i> script can be used to populate the <i>prepay_credit</i> table.
 </ul>
 </body>
diff --git a/httemplate/docs/upgrade8.html b/httemplate/docs/upgrade8.html
index a7b5853b3..d1b13fe9c 100644
--- a/httemplate/docs/upgrade8.html
+++ b/httemplate/docs/upgrade8.html
@@ -325,6 +325,7 @@ ALTER TABLE cust_refund DROP COLUMN crednum;
   <li><b>IMPORTANT</b>: run bin/create-history-tables
   <li><b>IMPORTANT: After running bin/create-history-tables</b>, run bin/dbdef-create again.
   <li>set the <a href="../config/config.cgi#username_policy">user_policy configuration value</a> as appropriate for your site.
+  <li>set the <a href="../config/config.cgi#locale">locale configuration value</a> to en_US.
   <li>the mxmachines, nsmachines, arecords and cnamerecords configuration values have been deprecated.  Set the <a href="../config/config.cgi#defaultrecords">defaultrecords configuration value</a> instead.
   <li>Create the `/usr/local/etc/freeside/cache.<i>datasrc</i>' directory
       (owned by the freeside user).
diff --git a/httemplate/edit/msgcat.cgi b/httemplate/edit/msgcat.cgi
index 5d256c05b..ee9b1c6b3 100755
--- a/httemplate/edit/msgcat.cgi
+++ b/httemplate/edit/msgcat.cgi
@@ -1,11 +1,12 @@
 <!-- mason kludge -->
 <%
 
-print header("Message catalog", menubar(
+print header("Edit Message catalog", menubar(
 #  'Main Menu' => $p,
 )), '<BR>';
 
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error')
+print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !. $cgi->param('error').
+      '</FONT><BR><BR>'
   if $cgi->param('error');
 
 my $widget = new HTML::Widgets::SelectLayers(
@@ -28,7 +29,7 @@ my $widget = new HTML::Widgets::SelectLayers(
         '<TR><TD>'. $msgcat->msgnum. '</TD><TD>'. $msgcat->msgcode. '</TD>'.
         '<TD><INPUT TYPE="text" SIZE=32 '.
         qq! NAME="!. $msgcat->msgnum. '" '.
-        qq!VALUE="!. $msgcat->msg. qq!"></TD>!;
+        qq!VALUE="!. ($cgi->param($msgcat->msgnum)||$msgcat->msg). qq!"></TD>!;
       unless ( $layer eq 'en_US' ) {
         my $en_msgcat = qsearchs('msgcat', {
           'locale'  => 'en_US',
diff --git a/httemplate/edit/process/msgcat.cgi b/httemplate/edit/process/msgcat.cgi
index ab30f06b5..1f94f6668 100644
--- a/httemplate/edit/process/msgcat.cgi
+++ b/httemplate/edit/process/msgcat.cgi
@@ -3,6 +3,7 @@
 my $error;
 foreach my $param ( grep { /^\d+$/ } $cgi->param ) {
   my $old = qsearchs('msgcat', { msgnum=>$param } );
+  next if $old->msg eq $cgi->param($param); #no need to update identical records
   my $new = new FS::msgcat { $old->hash };
   $new->msg($cgi->param($param));
   $error = $new->replace($old);