RADIUS group enhancements, overlimit_groups changes, etc. RT13432

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

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 13286cf..e7cadbe 100644 (file)
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -43,7 +43,10 @@ Click on a configuration value to change it.
   <TABLE BGCOLOR="#cccccc" BORDER=1 CELLSPACING=0 CELLPADDING=0 BORDERCOLOR="#999999">
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
-      <% ucfirst($section || 'unclassified') %> configuration options
+      <% ucfirst($section || 'unclassified') %>
+%     if ( $curuser->option('show_confitem_counts') ) {
+        (<% scalar( @{ $section_items{$section} } ) %> items)
+%     }
     </th>
   </tr>
 % foreach my $i (@{ $section_items{$section} }) { 
@@ -204,12 +207,20 @@ Click on a configuration value to change it.
 
             <tr>
               <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
+%               if ( $i->multiple ) {
+                    <% join('<BR>',
+                        map { $_ . ": " . &{ $i->option_sub }($_) }
+                                            $conf->config($i->key,$agentnum)
+                        )
+                    %>
+%               } else {
                 <% $conf->config($i->key, $agentnum) %>: 
                 <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) %>
+%               }
               </td>
             </tr>
 
-%   } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class)$/ ) {
+%   } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class|agent)$/ ) {
 %
 %     my $table = $1;
 %     my $namecol = $namecol{$table};
@@ -315,12 +326,14 @@ my %namecol = (
   'part_svc'  => 'svc',
   'part_pkg'  => 'pkg',
   'pkg_class' => 'classname',
+  'agent'     => 'agent',
 );
 </%once>
 <%init>
 
-die "access denied"
-  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied" unless $curuser->access_right('Configuration');
 
 my $page_agent = '';
 my $title;
@@ -345,7 +358,7 @@ my @config_items = grep { $page_agent ? $_->per_agent : 1 }
 my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );
 my %deleteable = map { $_ => 1 } @deleteable;
 
-my @sections = qw(required billing username password UI session shell BIND );
+my @sections = qw(required billing invoicing notification UI self-service ticketing username password session shell BIND telephony );
 push @sections, '', 'deprecated';
 
 my %section_items = ();