From e6b57805f6b3e76448ab9b6d280f2c53bc1410f3 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 15:29:31 +0000
Subject: preliminary web config editor

new config files: username-ampersand, passwordmax

fs-setup updates

get rid of old and crufty and unused registries/ config foo

documentation updates
---
 httemplate/config/config-process.cgi | 44 ++++++++++++++++++++++++++++++++++
 httemplate/config/config-view.cgi    | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 httemplate/config/config-process.cgi
 create mode 100644 httemplate/config/config-view.cgi

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
new file mode 100644
index 000000000..2dc4647ee
--- /dev/null
+++ b/httemplate/config/config-process.cgi
@@ -0,0 +1,44 @@
+<%
+  my $conf = new FS::Conf;
+  $FS::Conf::DEBUG = 1;
+  my @config_items = $conf->config_items;
+
+  foreach my $i ( @config_items ) {
+    my @touch = ();
+    my @delete = ();
+    my $n = 0;
+    foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+      if ( $type eq '' ) {
+      } elsif ( $type eq 'textarea' ) {
+        if ( $cgi->param($i->key. $n) ) {
+          $conf->set($i->key, $cgi->param($i->key. $n));
+        } else {
+          $conf->delete($i->key);
+        }
+      } elsif ( $type eq 'checkbox' ) {
+#        if ( defined($cgi->param($i->key. $n)) && $cgi->param($i->key. $n) ) {
+        if ( defined $cgi->param($i->key. $n) ) {
+          #$conf->touch($i->key);
+          push @touch, $i->key;
+        } else {
+          #$conf->delete($i->key);
+          push @delete, $i->key;
+        }
+      } elsif ( $type eq 'text' )  {
+        if ( $cgi->param($i->key. $n) ) {
+          $conf->set($i->key, $cgi->param($i->key. $n));
+        } else {
+          $conf->delete($i->key);
+        }
+      } else {
+      }
+      $n++;
+    }
+   # warn @touch;
+    $conf->touch($_) foreach @touch;
+    $conf->delete($_) foreach @delete;
+  }
+
+%>
+<%= $cgi->redirect("config-view.cgi") %>
+
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
new file mode 100644
index 000000000..09e535b2f
--- /dev/null
+++ b/httemplate/config/config-view.cgi
@@ -0,0 +1,46 @@
+<%= header('View Configuration', menubar( 'Main Menu' => $p,
+                                     'Edit Configuration' => 'config.cgi' ) ) %>
+
+<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
+
+<% foreach my $section ( qw(required billing username password UI session
+                            apache BIND shell
+                           ),
+                         '', 'depreciated') { %>
+  <%= table("#cccccc", 2) %>
+  <tr>
+    <th colspan="2" bgcolor="#dcdcdc">
+      <%= ucfirst($section || 'unclassified') %> configuration options
+    </th>
+  </tr>
+  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
+    <tr>
+      <td><a name="<%= $i->key %>">
+        <b><%= $i->key %></b>&nbsp;-&nbsp;<%= $i->description %>
+      </a></td>
+      <td><table border=0>
+        <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+             my $n = 0; %>
+          <% if ( $type eq '' ) { %>
+            <tr><td><font color="#ff0000">no type</font></td></tr>
+          <% } elsif ( $type eq 'textarea' ) { %>
+            <tr><td bgcolor="#ffffff">
+              <pre><%= join("\n", $conf->config($i->key) ) %></pre>
+            </td></tr>
+          <% } elsif ( $type eq 'checkbox' ) { %>
+            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+          <% } elsif ( $type eq 'text' )  { %>
+            <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+          <% } else { %>
+            <tr><td>
+              <font color="#ff0000">unknown type <%= $type %></font>
+            </td></tr>
+          <% } %>
+        <% $n++; } %>
+      </table></td>
+    </tr>
+  <% } %>
+  </table><br><br>
+<% } %>
+
+</body></html>
-- 
cgit v1.2.1


From 4308bf79cf9f31b6ec471788c34cde9b92a3c29b Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 24 Oct 2001 15:45:29 +0000
Subject: correct for browser munching

---
 httemplate/config/config-process.cgi | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 2dc4647ee..99957ebd9 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -11,7 +11,9 @@
       if ( $type eq '' ) {
       } elsif ( $type eq 'textarea' ) {
         if ( $cgi->param($i->key. $n) ) {
-          $conf->set($i->key, $cgi->param($i->key. $n));
+          my $value = $cgi->param($i->key. $n);
+          $value =~ s/\r\n/\n/g; #browsers?
+          $conf->set($i->key, $value);
         } else {
           $conf->delete($i->key);
         }
-- 
cgit v1.2.1


From 1904d44bb20adf403e21513db7470153f751d605 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 26 Oct 2001 09:50:21 +0000
Subject: otherwise people will have problems with `0' zero

---
 httemplate/config/config-process.cgi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 99957ebd9..690512977 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -10,7 +10,7 @@
     foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
       if ( $type eq '' ) {
       } elsif ( $type eq 'textarea' ) {
-        if ( $cgi->param($i->key. $n) ) {
+        if ( $cgi->param($i->key. $n) ne '' ) {
           my $value = $cgi->param($i->key. $n);
           $value =~ s/\r\n/\n/g; #browsers?
           $conf->set($i->key, $value);
@@ -27,7 +27,7 @@
           push @delete, $i->key;
         }
       } elsif ( $type eq 'text' )  {
-        if ( $cgi->param($i->key. $n) ) {
+        if ( $cgi->param($i->key. $n) ne '' ) {
           $conf->set($i->key, $cgi->param($i->key. $n));
         } else {
           $conf->delete($i->key);
-- 
cgit v1.2.1


From c34e73e4a0f8ab38adc88829598207e219a86928 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 30 Oct 2001 14:20:46 +0000
Subject: web config should workish now

---
 httemplate/config/config-view.cgi |  4 +++-
 httemplate/config/config.cgi      | 48 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 httemplate/config/config.cgi

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 09e535b2f..3c16c4815 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -25,7 +25,9 @@
             <tr><td><font color="#ff0000">no type</font></td></tr>
           <% } elsif ( $type eq 'textarea' ) { %>
             <tr><td bgcolor="#ffffff">
-              <pre><%= join("\n", $conf->config($i->key) ) %></pre>
+<pre>
+<%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
+</pre>
             </td></tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
new file mode 100644
index 000000000..32ddc043d
--- /dev/null
+++ b/httemplate/config/config.cgi
@@ -0,0 +1,48 @@
+<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+
+<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
+
+<form action="config-process.cgi">
+
+<% foreach my $section ( qw(required billing username password UI session
+                            apache BIND shell
+                           ),
+                         '', 'depreciated') { %>
+  <%= table("#cccccc", 2) %>
+  <tr>
+    <th colspan="2" bgcolor="#dcdcdc">
+      <%= ucfirst($section || 'unclassified') %> configuration options
+    </th>
+  </tr>
+  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
+    <tr>
+      <td>
+        <% my $n = 0;
+           foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
+             #warn $i->key unless defined($type);
+        %>
+          <% if ( $type eq '' ) { %>
+            <font color="#ff0000">no type</font>
+          <% } elsif ( $type eq 'textarea' ) { %>
+            <textarea name="<%= $i->key. $n %>" rows=5><%= join("\n", $conf->config($i->key) ) %></textarea>
+          <% } elsif ( $type eq 'checkbox' ) { %>
+            <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
+          <% } elsif ( $type eq 'text' )  { %>
+            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+          <% } else { %>
+            <font color="#ff0000">unknown type <%= $type %></font>
+          <% } %>
+        <% $n++; } %>
+      </td>
+      <td><a name="<%= $i->key %>">
+        <b><%= $i->key %></b> - <%= $i->description %>
+      </a></td>
+    </tr>
+  <% } %>
+  </table><br><br>
+<% } %>
+
+<input type="submit" value="Apply changes">
+</form>
+
+</body></html>
-- 
cgit v1.2.1


From da6df9f67f3db20a41ad9244db3f829600f678fd Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 04:55:49 +0000
Subject: config web GUI updates.  almost usable now.

---
 httemplate/config/config-view.cgi | 2 +-
 httemplate/config/config.cgi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 3c16c4815..4b6684980 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -4,7 +4,7 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            apache BIND shell
+                            shell mail radius apache BIND
                            ),
                          '', 'depreciated') { %>
   <%= table("#cccccc", 2) %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 32ddc043d..972ec06a4 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -5,7 +5,7 @@
 <form action="config-process.cgi">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            apache BIND shell
+                            shell mail radius apache BIND
                            ),
                          '', 'depreciated') { %>
   <%= table("#cccccc", 2) %>
-- 
cgit v1.2.1


From 762cb807561ae9805a3eac0616442012eced93b0 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 2 Nov 2001 05:28:33 +0000
Subject: note config changes need apache/freeside-queued restart to take
 effect

---
 httemplate/config/config.cgi | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 972ec06a4..f9d7297ec 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -42,6 +42,9 @@
   </table><br><br>
 <% } %>
 
+You may need to restart Apache and/or freeside-queued for configuration
+changes to take effect.<BR>
+
 <input type="submit" value="Apply changes">
 </form>
 
-- 
cgit v1.2.1


From b6724f3cf6c4b77ab66d259920042f12e46cf924 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 8 Dec 2001 10:08:50 +0000
Subject: need a POST here; browsers (especially IE) are unhappy with the
 default GET

---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index f9d7297ec..56da0698a 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -2,7 +2,7 @@
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form action="config-process.cgi">
+<form action="config-process.cgi" METHOD="POST">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
-- 
cgit v1.2.1


From a4c96748eb6eab29a70f3a944c6520283a635c78 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 10 Feb 2002 16:05:22 +0000
Subject: *finally* seems to be working under Mason.  sheesh. *finally* seems
 to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh. *finally* seems to be working under
 Mason.  sheesh. *finally* seems to be working under Mason.  sheesh. *finally*
 seems to be working under Mason.  sheesh.

---
 httemplate/config/config-process.cgi | 1 -
 httemplate/config/config-view.cgi    | 1 +
 httemplate/config/config.cgi         | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 690512977..50f0d34ff 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -43,4 +43,3 @@
 
 %>
 <%= $cgi->redirect("config-view.cgi") %>
-
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 4b6684980..b041adaed 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%= header('View Configuration', menubar( 'Main Menu' => $p,
                                      'Edit Configuration' => 'config.cgi' ) ) %>
 
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 56da0698a..b9e84a8d5 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,3 +1,4 @@
+<!-- mason kludge -->
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
-- 
cgit v1.2.1


From ae23f6fe1ca915c995cfbf29bb39e7ed5e1cce2c Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 12 Feb 2002 02:11:07 +0000
Subject: add username_policy "@append domain"

add "select" config type, mmm
---
 httemplate/config/config.cgi | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index b9e84a8d5..f640d0b5e 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -30,6 +30,16 @@
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
             <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+          <% } elsif ( $type eq 'select' )  { %>
+            <select name="<%= $i->key. $n %>">
+              <% my %saw;
+                 foreach my $value ( "", @{$i->select_enum} ) {
+                    local($^W)=0; next if $saw{$value}++; %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>
+              <% } %>
+              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
+              <% } %>
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
-- 
cgit v1.2.1


From eca2a638625ac22a64b9807d9c4c7ee9a5090ebb Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 22 Feb 2002 12:31:40 +0000
Subject: fixup <SELECT> configuration editing, fixes Bug#350

---
 httemplate/config/config-process.cgi | 2 +-
 httemplate/config/config-view.cgi    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 50f0d34ff..a296abfe4 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -26,7 +26,7 @@
           #$conf->delete($i->key);
           push @delete, $i->key;
         }
-      } elsif ( $type eq 'text' )  {
+      } elsif ( $type eq 'text' || $type eq 'select' )  {
         if ( $cgi->param($i->key. $n) ne '' ) {
           $conf->set($i->key, $cgi->param($i->key. $n));
         } else {
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index b041adaed..225c29507 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -32,7 +32,7 @@
             </td></tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
-          <% } elsif ( $type eq 'text' )  { %>
+          <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
             <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
           <% } else { %>
             <tr><td>
-- 
cgit v1.2.1


From e8dc13cd1af07846cd3015986f3a3fd34cdcdaea Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Thu, 28 Feb 2002 22:05:31 +0000
Subject: s/depreciated/deprecated/

---
 httemplate/config/config-view.cgi | 2 +-
 httemplate/config/config.cgi      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 225c29507..138ec4737 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -7,7 +7,7 @@
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
-                         '', 'depreciated') { %>
+                         '', 'deprecated') { %>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index f640d0b5e..19775c7aa 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -8,7 +8,7 @@
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
-                         '', 'depreciated') { %>
+                         '', 'deprecated') { %>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
-- 
cgit v1.2.1


From 697dfd9ac2dfa36aa244e6d2d9f2e8f8a364a120 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 17 Mar 2002 08:33:39 +0000
Subject: new domain record editing foo

---
 httemplate/config/config-view.cgi | 15 ++++++-
 httemplate/config/config.cgi      | 95 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 108 insertions(+), 2 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 138ec4737..917cc7316 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -8,6 +8,19 @@
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <FONT SIZE="-2">
+  <% foreach my $nav_section ( qw(required billing username password UI session
+                                  shell mail radius apache BIND
+                                 ),
+                               '', 'deprecated') { %>
+    <% if ( $section eq $nav_section ) { %>
+      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } else { %>
+      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } %>
+  <% } %>
+  </FONT><BR>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -24,7 +37,7 @@
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
             <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif ( $type eq 'textarea' ) { %>
+          <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %>
             <tr><td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 19775c7aa..155dcfdbc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,14 +1,39 @@
 <!-- mason kludge -->
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<SCRIPT>
+var gSafeOnload = new Array();
+window.onload = SafeOnload;
+function SafeAddOnLoad(f) {
+  gSafeOnload[gSafeOnload.length] = f;
+}
+function SafeOnload()
+{
+  for (var i=0;i<gSafeOnload.length;i++)
+    gSafeOnload[i]();
+}
+</SCRIPT>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form action="config-process.cgi" METHOD="POST">
+<form name="OneTrueForm" action="config-process.cgi" METHOD="POST">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <FONT SIZE="-2">
+  <% foreach my $nav_section ( qw(required billing username password UI session
+                                  shell mail radius apache BIND
+                                 ),
+                               '', 'deprecated') { %>
+    <% if ( $section eq $nav_section ) { %>
+      [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } else { %>
+      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+    <% } %>
+  <% } %>
+  </FONT><BR>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -40,6 +65,74 @@
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
               <% } %>
+          <% } elsif ( $type eq 'editlist' )  { %>
+            <script>
+              function doremove<%= $i->key. $n %>() {
+                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+                for (var i=fromObject.options.length-1;i>-1;i--) {
+                  if (fromObject.options[i].selected)
+                    deleteOption<%= $i->key. $n %>(fromObject,i);
+                }
+              }
+              function deleteOption<%= $i->key. $n %>(object,index) {
+                object.options[index] = null;
+              }
+              function doadd<%= $i->key. $n %>(object) {
+                var myvalue = "";
+                <% if ( defined($i->editlist_parts) ) { %>
+
+                  <% foreach my $pnum ( 0 .. scalar(@{$i->editlist_parts})-1 ) { %>
+
+                    if ( myvalue != "" ) { myvalue = myvalue + " "; }
+                    <% if ( $i->editlist_parts->[$pnum]{type} eq 'select' ) { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.options[object.add<%= $i->key. $n . "_$pnum" %>.selectedIndex].value;
+                      <!-- #RESET SELECT??  maybe not... -->
+                    <% } elsif ( $i->editlist_parts->[$pnum]{type} eq 'immutable' ) { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
+                    <% } else { %>
+                      myvalue = myvalue + object.add<%= $i->key. $n . "_$pnum" %>.value;
+                      object.add<%= $i->key. $n. "_$pnum" %>.value = "";
+                    <% } %>
+
+
+                  <% } %>
+                <% } else { %>
+                  myvalue = object.add<%= $i->key. $n. "_1" %>.value;
+                <% } %>
+                var optionName = new Option(myvalue, myvalue);
+                var length = object.<%= $i->key. $n %>.length;
+                object.<%= $i->key. $n %>.options[length] = optionName;
+              }
+            </script>
+            <select multiple size=5 name="<%= $i->key. $n %>">
+            <option selected>--------------------------------</option>
+            <% foreach my $line ( $conf->config($i->key) ) { %>
+              <option value="$line">$line</option>
+            <% } %>
+            </select><br>
+            <input type="button" value="remove selected" onClick="doremove<%= $i->key. $n %>()">
+            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>)</script>
+            <br>
+            <% if ( defined $i->editlist_parts ) { %>
+              <% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) { %>
+                <% if ( $part->{type} eq 'text' ) { %>
+                  <input type="text" name="add<%= $i->key. $n."_$pnum" %>">
+                <% } elsif ( $part->{type} eq 'immutable' ) { %>
+                  <%= $part->{value} %><input type="hidden" name="add<%= $i->key. $n. "_$pnum" %>" value="<%= $part->{value} %>">
+                <% } elsif ( $part->{type} eq 'select' ) { %>
+                  <select name="add<%= $i->key. $n. "_$pnum" %>">
+                  <% foreach my $key ( keys %{$part->{select_enum}} ) { %>
+                    <option value="<%= $key %>"><%= $part->{select_enum}{$key} %></option>
+                  <% } %>
+                  </select>
+                <% } else { %>
+                  <font color="#ff0000">unknown type <%= $part->type %></font>
+                <% } %>
+              <% $pnum++; } %>
+            <% } else { %>
+              <input type="text" name="add<%= $i->key. $n %>_0">
+            <% } %>
+            <input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)">
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
-- 
cgit v1.2.1


From daac302e231e2e09b84e771c0413b0f2119c52e8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 09:10:12 +0000
Subject: new config value `defaultrecords', documentation, javascript config
 file editor

---
 httemplate/config/config-process.cgi |  6 +++++
 httemplate/config/config-view.cgi    |  4 +--
 httemplate/config/config.cgi         | 51 +++++++++++++++++++++++++-----------
 3 files changed, 44 insertions(+), 17 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index a296abfe4..38d9af0db 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -32,6 +32,12 @@
         } else {
           $conf->delete($i->key);
         }
+      } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' )  {
+        if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) {
+          $conf->set($i->key, join("\n", $cgi->param($i->key. $n) ));
+        } else {
+          $conf->delete($i->key);
+        }
       } else {
       }
       $n++;
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 917cc7316..d40c4dc10 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -8,6 +8,7 @@
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
                                   shell mail radius apache BIND
@@ -16,11 +17,10 @@
     <% if ( $section eq $nav_section ) { %>
       [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } else { %>
-      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } %>
   <% } %>
   </FONT><BR>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 155dcfdbc..5013de0dc 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -2,25 +2,33 @@
 <%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 <SCRIPT>
 var gSafeOnload = new Array();
+var gSafeOnsubmit = new Array();
 window.onload = SafeOnload;
 function SafeAddOnLoad(f) {
   gSafeOnload[gSafeOnload.length] = f;
 }
-function SafeOnload()
-{
+function SafeOnload() {
   for (var i=0;i<gSafeOnload.length;i++)
     gSafeOnload[i]();
 }
+function SafeAddOnSubmit(f) {
+  gSafeOnsubmit[gSafeOnsubmit.length] = f;
+}
+function SafeOnsubmit() {
+  for (var i=0;i<gSafeOnsubmit.length;i++)
+    gSafeOnsubmit[i]();
+}
 </SCRIPT>
 
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
-<form name="OneTrueForm" action="config-process.cgi" METHOD="POST">
+<form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
                             shell mail radius apache BIND
                            ),
                          '', 'deprecated') { %>
+  <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
                                   shell mail radius apache BIND
@@ -29,11 +37,10 @@ function SafeOnload()
     <% if ( $section eq $nav_section ) { %>
       [<A NAME="not<%= $nav_section || 'unclassified' %>" style="background-color: #cccccc"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } else { %>
-      [<A HREF="#<%= $nav_section %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
+      [<A HREF="#<%= $nav_section || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
     <% } %>
   <% } %>
   </FONT><BR>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
   <%= table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
@@ -65,6 +72,7 @@ function SafeOnload()
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
               <% } %>
+            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {
@@ -77,6 +85,12 @@ function SafeOnload()
               function deleteOption<%= $i->key. $n %>(object,index) {
                 object.options[index] = null;
               }
+              function selectall<%= $i->key. $n %>() {
+                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+                for (var i=fromObject.options.length-1;i>-1;i--) {
+                  fromObject.options[i].selected = true;
+                }
+              }
               function doadd<%= $i->key. $n %>(object) {
                 var myvalue = "";
                 <% if ( defined($i->editlist_parts) ) { %>
@@ -105,16 +119,19 @@ function SafeOnload()
               }
             </script>
             <select multiple size=5 name="<%= $i->key. $n %>">
-            <option selected>--------------------------------</option>
+            <option selected>----------------------------------------------------------------</option>
             <% foreach my $line ( $conf->config($i->key) ) { %>
-              <option value="$line">$line</option>
+              <option value="<%= $line %>"><%= $line %></option>
             <% } %>
             </select><br>
             <input type="button" value="remove selected" onClick="doremove<%= $i->key. $n %>()">
-            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>)</script>
+            <script>SafeAddOnLoad(doremove<%= $i->key. $n %>);
+                    SafeAddOnSubmit(selectall<%= $i->key. $n %>);</script>
             <br>
+            <%= itable() %><tr>
             <% if ( defined $i->editlist_parts ) { %>
               <% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) { %>
+                <td>
                 <% if ( $part->{type} eq 'text' ) { %>
                   <input type="text" name="add<%= $i->key. $n."_$pnum" %>">
                 <% } elsif ( $part->{type} eq 'immutable' ) { %>
@@ -128,11 +145,13 @@ function SafeOnload()
                 <% } else { %>
                   <font color="#ff0000">unknown type <%= $part->type %></font>
                 <% } %>
+                </td>
               <% $pnum++; } %>
             <% } else { %>
-              <input type="text" name="add<%= $i->key. $n %>_0">
+              <td><input type="text" name="add<%= $i->key. $n %>_0"></td>
             <% } %>
-            <input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)">
+            <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
+            </tr></table>
           <% } else { %>
             <font color="#ff0000">unknown type <%= $type %></font>
           <% } %>
@@ -143,13 +162,15 @@ function SafeOnload()
       </a></td>
     </tr>
   <% } %>
-  </table><br><br>
-<% } %>
+  </table><br>
 
-You may need to restart Apache and/or freeside-queued for configuration
-changes to take effect.<BR>
+  You may need to restart Apache and/or freeside-queued for configuration
+  changes to take effect.<br>
+
+  <input type="submit" value="Apply changes"><br><br>
+
+<% } %>
 
-<input type="submit" value="Apply changes">
 </form>
 
 </body></html>
-- 
cgit v1.2.1


From f7e1679114d88fcb8499aafb5386616c93a7c9ee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Mon, 18 Mar 2002 17:50:54 +0000
Subject: fixes bug#367 (yay, that one was annoying):

in config editor, initial newlines in <textarea>s are lost.  even if
you didn't mean to edit them you remove that..
---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 5013de0dc..4f19ee961 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -57,7 +57,7 @@ function SafeOnsubmit() {
           <% if ( $type eq '' ) { %>
             <font color="#ff0000">no type</font>
           <% } elsif ( $type eq 'textarea' ) { %>
-            <textarea name="<%= $i->key. $n %>" rows=5><%= join("\n", $conf->config($i->key) ) %></textarea>
+            <textarea name="<%= $i->key. $n %>" rows=5><%= "\n". join("\n", $conf->config($i->key) ) %></textarea>
           <% } elsif ( $type eq 'checkbox' ) { %>
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
-- 
cgit v1.2.1


From fca110eff969104793774ed717985e91c53f5318 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 7 Apr 2002 00:00:41 +0000
Subject: - config option for signup server payment types - credit card type
 pulldown on signup server (closes: Bug#383)

---
 httemplate/config/config-process.cgi | 2 +-
 httemplate/config/config-view.cgi    | 6 ++++--
 httemplate/config/config.cgi         | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 38d9af0db..259713260 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -34,7 +34,7 @@
         }
       } elsif ( $type eq 'editlist' || $type eq 'selectmultiple' )  {
         if ( scalar(@{[ $cgi->param($i->key. $n) ]}) ) {
-          $conf->set($i->key, join("\n", $cgi->param($i->key. $n) ));
+          $conf->set($i->key, join("\n", @{[ $cgi->param($i->key. $n) ]} ));
         } else {
           $conf->delete($i->key);
         }
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index d40c4dc10..f0ae2b2fd 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -37,7 +37,9 @@
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
             <tr><td><font color="#ff0000">no type</font></td></tr>
-          <% } elsif ( $type eq 'textarea' || $type eq 'editlist' ) { %>
+          <% } elsif (   $type eq 'textarea'
+                      || $type eq 'editlist'
+                      || $type eq 'selectmultiple' ) { %>
             <tr><td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
@@ -46,7 +48,7 @@
           <% } elsif ( $type eq 'checkbox' ) { %>
             <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%=  $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 4f19ee961..2817e5f84 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -62,12 +62,12 @@ function SafeOnsubmit() {
             <input name="<%= $i->key. $n %>" type="checkbox" value="1"<%= $conf->exists($i->key) ? ' CHECKED' : '' %>>
           <% } elsif ( $type eq 'text' )  { %>
             <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
-          <% } elsif ( $type eq 'select' )  { %>
-            <select name="<%= $i->key. $n %>">
+          <% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { %>
+            <select name="<%= $i->key. $n %>" <%= $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
               <% my %saw;
                  foreach my $value ( "", @{$i->select_enum} ) {
                     local($^W)=0; next if $saw{$value}++; %>
-                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
               <% } %>
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
-- 
cgit v1.2.1


From e1ef1693e6942bbf82ee088f782d871a3b5eefee Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Wed, 3 Jul 2002 02:26:00 +0000
Subject: deprecate text radius config options update config docs

---
 httemplate/config/config-view.cgi | 4 ++--
 httemplate/config/config.cgi      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index f0ae2b2fd..bafe5a8e7 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -5,13 +5,13 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail radius apache BIND
+                            shell mail apache BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail radius apache BIND
+                                  shell mail apache BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 2817e5f84..c050a19ab 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -25,13 +25,13 @@ function SafeOnsubmit() {
 <form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail radius apache BIND
+                            shell mail apache BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail radius apache BIND
+                                  shell mail apache BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
-- 
cgit v1.2.1


From 262928f0a043f1fd35bdf0df9a2fb1b1658c1dce Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 5 Jul 2002 23:32:08 +0000
Subject: fix bug with config having a value not in the select

---
 httemplate/config/config.cgi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index c050a19ab..fd9a82958 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -70,7 +70,7 @@ function SafeOnsubmit() {
                 <option value="<%= $value %>"<%= $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><%= $value %>
               <% } %>
               <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! grep { $conf->config($i->key) eq $_ } @{$i->select_enum}) { %>
-                <option value=<%= $conf->config($i->key) %> SELECTED><%= conf->config($i->key) %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
           <% } elsif ( $type eq 'editlist' )  { %>
-- 
cgit v1.2.1


From a741f52db660b39a3f3c12acd0623d87bfc9108a Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Tue, 22 Apr 2003 18:46:52 +0000
Subject: properly deprecate ancient apache & sendmail config options

---
 httemplate/config/config-view.cgi | 4 ++--
 httemplate/config/config.cgi      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index bafe5a8e7..9a0006792 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -5,13 +5,13 @@
 <% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
+                            shell BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
+                                  shell BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index fd9a82958..409869e11 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -25,13 +25,13 @@ function SafeOnsubmit() {
 <form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
 
 <% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
+                            shell BIND
                            ),
                          '', 'deprecated') { %>
   <A NAME="<%= $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
   <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail apache BIND
+                                  shell BIND
                                  ),
                                '', 'deprecated') { %>
     <% if ( $section eq $nav_section ) { %>
-- 
cgit v1.2.1


From 4b4b3ca9cb0b7336293b759549b78fc903a7d8c8 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sat, 15 Oct 2005 11:29:54 +0000
Subject: agent option to select RT queue

---
 httemplate/config/config-view.cgi | 26 +++++++++++++++++++++-----
 httemplate/config/config.cgi      | 15 +++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

(limited to 'httemplate/config')

diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 9a0006792..8011e7697 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -36,19 +36,35 @@
         <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
-            <tr><td><font color="#ff0000">no type</font></td></tr>
+            <tr>
+              <td><font color="#ff0000">no type</font></td>
+            </tr>
           <% } elsif (   $type eq 'textarea'
                       || $type eq 'editlist'
                       || $type eq 'selectmultiple' ) { %>
-            <tr><td bgcolor="#ffffff">
+            <tr>
+              <td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
 </pre>
-            </td></tr>
+              </td>
+            </tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+            <tr>
+              <td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
+            </tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
+              </td></tr>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->config($i->key) %>: 
+                <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              </td>
+            </tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 409869e11..ff29d8578 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -73,6 +73,21 @@ function SafeOnsubmit() {
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <select name="<%= $i->key. $n %>">
+              <option value="">
+              <% my %options = &{$i->options_sub};
+                 my @options = sort { $a <=> $b } keys %options;
+                 my %saw;
+                 foreach my $value ( @options ) {
+                    local($^W)=0; next if $saw{$value}++;
+              %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>: <%= $options{$value} %>
+              <% } %>
+              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! exists $options{$conf->config($i->key)} ) { %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              <% } %>
+            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {
-- 
cgit v1.2.1