event refactor, landing on HEAD!

3 files changed, 18 insertions, 9 deletions

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 0210d85a7..b0c8a7456 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -4,7 +4,8 @@ die "access denied\n"
 
 my $conf = new FS::Conf;
 $FS::Conf::DEBUG = 1;
-my @config_items = $conf->config_items;
+my @config_items = grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items;
 my %confitems = map { $_->key => $_ } $conf->config_items;
 
 my $agentnum = $cgi->param('agentnum');
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 4d709e8c2..bca1f1603 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -38,7 +38,7 @@
 % } 
 
   </FONT><BR>
-  <% table("#cccccc", 2) %>
+  <% include('/elements/table.html', '#cccccc' ) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
       <% ucfirst($section || 'unclassified') %> configuration options
@@ -114,15 +114,16 @@
 
 </body></html>
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my ($conf, $title, @config_items, $agentnum);
-
+my $agentnum = '';
 if ($cgi->param('agentnum') =~ /^(\d+)$/) {
   $agentnum = $1;
 }
 
+my $title;
 if ($agentnum) {
   my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
   die "Agent $agentnum not found!" unless $agent;
@@ -132,7 +133,10 @@ if ($agentnum) {
   $title = 'Global Configuration';
 }
 
-$conf = new FS::Conf;
-@config_items = grep { $agentnum ? $_->per_agent : 1 } $conf->config_items; 
-
+my $conf = new FS::Conf;
+ 
+my @config_items = grep { $agentnum ? $_->per_agent : 1 }
+                   grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items; 
+ 
 </%init>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 10bbadaf8..485565e80 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -267,11 +267,15 @@ Setting <% $key %>
 </BODY>
 </HTML>
 <%once>
+
 my $conf = new FS::Conf;
-my %confitems = map { $_->key => $_ } $conf->config_items;
-</%once>
+my @config_items = grep { $_->key != ~/^invoice_(html|latex|template)/ }
+                        $conf->config_items; 
+my %confitems = map { $_->key => $_ } @config_items;
 
+</%once>
 <%init>
+
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');