default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / config / config-view.cgi

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 248af37..5f09b12 100644 (file)
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -133,12 +133,13 @@ invoice language options:
 
     <tr>
 %     unless ( $cgi->param('showagent') ) {
-        <td><% include('/elements/popup_link.html',
+        <td>
+          <% include('/elements/popup_link.html',
                          'action'      => $action,
                          'width'       => $width,
                          'height'      => $height,
                          'actionlabel' => 'Enter configuration value',
-                         'label'       => "<b>$label</b>",
+                         'html_label'  => "<b>$label</b>",
                          'aname'       => $i->key,
                     )
           %>: 
@@ -211,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>
 
@@ -434,7 +439,7 @@ my @sections = (qw(
     important
     billing payments payment_batching credit_cards e-checks taxation
     packages suspension cancellation
-    printing print_services
+    printing print_services email_to_voice_services
       invoicing invoice_email invoice_balances invoice_templates quotations 
     notification UI addresses customer_number customer_fields reporting
     localization scalability backup
@@ -442,7 +447,7 @@ my @sections = (qw(
     API ticketing appointments network_monitoring
     services
       username password
-      telephony RADIUS wireless_broadband shell BIND hosting
+      telephony telephony_invoicing RADIUS wireless_broadband shell BIND hosting
   ), '', qw( development deprecated )
 );