[freeside-commits] branch FREESIDE_4_BRANCH updated. cd5f689af969136fb11b017917a0d75aa0fb7808

[Ivan]

The branch, FREESIDE_4_BRANCH has been updated
       via  cd5f689af969136fb11b017917a0d75aa0fb7808 (commit)
      from  5daa8d5c842af3ae4b94cc9a4f5c6a0a9cef9eac (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 cd5f689af969136fb11b017917a0d75aa0fb7808
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Sep 5 18:30:00 2017 -0700

    if a single entry has bad UTF-8 chars, error out on that entry only instead of the whole conf page

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index edbda5c..b956974 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -212,11 +212,15 @@ invoice language options:
 
             <tr>
               <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
-<font size="-2"><pre><% encode_entities(join("\n",
-     map { length($_) > 88 ? substr($_,0,88).'...' : $_ }
-         $conf->config($i->key, $agentnum)
-   ) )
-%></pre></font>
+
+% my $escaped = eval { encode_entities(join("\n",
+%                        map { length($_) > 88 ? substr($_,0,88).'...' : $_ }
+%                          $conf->config($i->key, $agentnum)
+%                      ) );
+%                    };
+% $escaped = $@ ? '('.encode_entities($@).')' : $escaped;
+<font size="-2"><pre><% $escaped %></pre></font>
+
               </td>
             </tr>
 

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

Summary of changes:
 httemplate/config/config-view.cgi |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)