</tr>
% foreach my $i (@{ $section_items{$section} }) {
% my @types = ref($i->type) ? @{$i->type} : ($i->type);
-% my( $width, $height ) = ( 522, 336 );
+%# my( $width, $height ) = ( 522, 336 );
+% my( $width, $height ) = ( 600, 336 );
% if ( grep $_ eq 'textarea', @types ) {
% #800x600
% $width = 763;
% @agents = ( '' );
% if ( $i->per_agent ) {
% foreach my $agent (@all_agents) {
-% if ( defined(_config_agentonly($conf, $i->key, $agent->agentnum)) ) {
+% if ( defined($conf->conf( $i->key, $agent->agentnum, 1 ) ) ) {
% push @agents, $agent;
% } else {
% push @add_agents, $agent;
% foreach my $agent ( @agents ) {
% my $agentnum = $agent ? $agent->agentnum : '';
%
+% next if $section eq 'deprecated' && ! $conf->exists($i->key, $agentnum);
+%
% my $label = $i->key;
% $label = '['. $agent->agent. "] $label"
% if $agent && $cgi->param('showagent');
)
%>: <% $i->description %>
% if ( $agent && $cgi->param('showagent') ) {
-% my $confnum =
-% _config_agentonly($conf, $i->key, $agent->agentnum)->confnum;
+% my $confnum = $conf->conf( $i->key, $agent->agentnum, 1 )->confnum;
(<A HREF="javascript:areyousure('delete this agent override', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view_showagent')">delete agent override</A>)
% } elsif ( $i->base_key
% || ( $deleteable{$i->key} && $conf->exists($i->key) ) ) {
% my $confnum =
% $agent
-% ? _config_agentonly($conf, $i->key, $agent->agentnum)->confnum
-% : $conf->_config( $i->key )->confnum;
+% ? $conf->conf( $i->key, $agent->agentnum, 1 )->confnum
+% : $conf->conf( $i->key )->confnum;
% my $showagent = $cgi->param('showagent') ? '_showagent' : '';
(<A HREF="javascript:areyousure('delete this configuration item', 'config-delete.cgi?confnum=<% $confnum %>;redirect=config_view<%$showagent%>')">delete configuration item</A>)
% }
% } elsif ( $type eq 'textarea'
% || $type eq 'editlist'
-% || $type eq 'selectmultiple' ) {
+% || $type eq 'selectmultiple'
+% )
+% {
<tr>
<td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
</td>
</tr>
-% } elsif ( $type eq 'select-sub' ) {
+% } elsif ( $type eq 'select-sub' ) {
<tr>
<td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
</td>
</tr>
-% } else {
+% } elsif ( $type =~ /^select-(part_svc|part_pkg)$/ ) {
+% my @keys = $conf->config($i->key, $agentnum);
+
+ <tr>
+ <td id="<% $agentnum.$i->key.$n %>" bgcolor="#ffffff">
+ <% join('<BR>', map { $_ # ': '. $svc, $pkg, whatever
+ }
+ @keys
+ )
+ %>
+ </td>
+ </tr>
+
+% } else {
<tr><td>
<font color="#ff0000">unknown type <% $type %></font>
</td></tr>
-% }
+% }
% $n++;
% }
</SCRIPT>
</body></html>
-<%once>
-
-#should probably be a Conf method. what else would need to use it?
-sub _config_agentonly {
- my($self,$name,$agentnum)=@_;
- my $hashref = { 'name' => $name };
- $hashref->{agentnum} = $agentnum;
- local $FS::Record::conf = undef; # XXX evil hack prevents recursion
- FS::Record::qsearchs('conf', $hashref);
-}
-
-</%once>
<%init>
die "access denied"
my $conf = new FS::Conf;
my @config_items = grep { $page_agent ? $_->per_agent : 1 }
+ grep { $page_agent ? 1 : !$_->agentonly }
$conf->config_items;
my @deleteable = qw( invoice_latexreturnaddress invoice_htmlreturnaddress );