[freeside-commits] branch FREESIDE_4_BRANCH updated. f4ab9c03202d393907a195b957bbd134ca972985

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  f4ab9c03202d393907a195b957bbd134ca972985 (commit)
      from  fef753a00170c17020399f88751070bc03ac6173 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f4ab9c03202d393907a195b957bbd134ca972985
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Sep 25 14:36:54 2016 -0700

    fix emailing customers on deb 7, RT#72513, RT#33316

diff --git a/httemplate/misc/email-customers.html b/httemplate/misc/email-customers.html
index d086c67..b228b72 100644
--- a/httemplate/misc/email-customers.html
+++ b/httemplate/misc/email-customers.html
@@ -153,13 +153,13 @@ function toggle(obj) {
 %   # if we've already established a draft template, don't let msgnum be changed
     <& /elements/hidden.html,
       field => 'msgnum',
-      curr_value => ($cgi->param('msgnum') || ''),
+      curr_value => ( scalar($cgi->param('msgnum')) || ''),
     &>
 % } else {
 Template: 
     <& /elements/select-msg_template.html,
         onchange   => 'toggle(this)',
-        curr_value => ($cgi->param('msgnum') || ''),
+        curr_value => ( scalar($cgi->param('msgnum')) || ''),
     &>
     <BR>
 % }
@@ -184,14 +184,14 @@ Send to contacts:
               'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) ||
                          $conf->config('company_name', $agent_virt_agentnum), #?
               'size'  => 20,
-              'curr_value' => $cgi->param('from_name'),
+              'curr_value' => scalar($cgi->param('from_name')),
           &> <\
           <& /elements/input-text.html,
               'field' => 'from_addr',
               'type'  => 'email', # HTML5, woot
               'value' => $conf->config('invoice_from', $agent_virt_agentnum),
               'size'  => 20,
-              'curr_value' => $cgi->param('from_addr'),
+              'curr_value' => scalar($cgi->param('from_addr')),
           &>></TD>
  
     <& /elements/tr-input-text.html,
@@ -361,7 +361,9 @@ if ( !$cgi->param('preview') ) {
   }
 
   # contact_class_X params
-  foreach my $param ( $cgi->multi_param ) {
+  #we can't switch to multi_param until we're done supporting deb 7
+  local($CGI::LIST_CONTEXT_WARN) = 0;
+  foreach my $param ( $cgi->param ) {
     if ( $param =~ /^contact_class_(\w+)$/ ) {
       push @contact_classnum, $1;
       if ( $1 eq 'invoice' ) {

-----------------------------------------------------------------------

Summary of changes:
 httemplate/misc/email-customers.html |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)