X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig.cgi;h=369314d98986d947acf29925a4178e1a97eccd06;hp=fd9a82958f16cb3bd4e469153a69a143487e34b9;hb=3ce7691203a7737406bf2d4442f7fd84b81f847e;hpb=262928f0a043f1fd35bdf0df9a2fb1b1658c1dce

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index fd9a82958..369314d98 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -1,5 +1,5 @@
 <!-- mason kludge -->
-<%= header('Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<% include("/elements/header.html",'Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
 <SCRIPT>
 var gSafeOnload = new Array();
 var gSafeOnsubmit = new Array();
@@ -19,157 +19,241 @@ function SafeOnsubmit() {
     gSafeOnsubmit[i]();
 }
 </SCRIPT>
+% my $conf = new FS::Conf; my @config_items = $conf->config_items; 
 
-<% my $conf = new FS::Conf; my @config_items = $conf->config_items; %>
 
 <form name="OneTrueForm" action="config-process.cgi" METHOD="POST" onSubmit="SafeOnsubmit()">
+% foreach my $section ( qw(required billing username password UI session
+%                            shell BIND
+%                           ),
+%                         '', 'deprecated') { 
 
-<% foreach my $section ( qw(required billing username password UI session
-                            shell mail apache BIND
-                           ),
-                         '', 'deprecated') { %>
-  <A NAME="<%= $section || 'unclassified' %>"></A>
+  <A NAME="<% $section || 'unclassified' %>"></A>
   <FONT SIZE="-2">
-  <% foreach my $nav_section ( qw(required billing username password UI session
-                                  shell mail 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 || 'unclassified' %>"><%= ucfirst($nav_section || 'unclassified') %></A>]
-    <% } %>
-  <% } %>
+% foreach my $nav_section ( qw(required billing username password UI session
+%                                  shell 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 || 'unclassified' %>"><% ucfirst($nav_section || 'unclassified') %></A>]
+% } 
+% } 
+
   </FONT><BR>
-  <%= table("#cccccc", 2) %>
+  <% table("#cccccc", 2) %>
   <tr>
     <th colspan="2" bgcolor="#dcdcdc">
-      <%= ucfirst($section || 'unclassified') %> configuration options
+      <% ucfirst($section || 'unclassified') %> configuration options
     </th>
   </tr>
-  <% foreach my $i (grep $_->section eq $section, @config_items) { %>
+% 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><%= "\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' )  { %>
-            <input name="<%= $i->key. $n %>" type="<%= $type %>" value="<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
-          <% } 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) || ( $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) %>
-              <% } %>
+% 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><% "\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' )  { 
+
+
+               <input name="<% $i->key. $n %>" type="<% $type %>" value="<% $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
+% } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { 
+
+          
+               <select name="<% $i->key. $n %>" <% $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
+% 
+%                  my %hash = ();
+%                  if ( $i->select_enum ) {
+%                    tie %hash, 'Tie::IxHash',
+%                      '' => '', map { $_ => $_ } @{ $i->select_enum };
+%                  } elsif ( $i->select_hash ) {
+%                    if ( ref($i->select_hash) eq 'ARRAY' ) {
+%                      tie %hash, 'Tie::IxHash',
+%                        '' => '', @{ $i->select_hash };
+%                    } else {
+%                      tie %hash, 'Tie::IxHash',
+%                        '' => '', %{ $i->select_hash };
+%                    }
+%                  } else {
+%                    %hash = ( '' => 'WARNING: neither select_enum nor select_hash specified in Conf.pm for configuration option "'. $i->key. '"' );
+%                  }
+%
+%                  my %saw = ();
+%                  foreach my $value ( keys %hash ) {
+%                    local($^W)=0; next if $saw{$value}++;
+%                    my $label = $hash{$value};
+%               
+
+
+                    <option value="<% $value %>"<% $value eq $conf->config($i->key) || ( $type eq 'selectmultiple' && grep { $_ eq $value } $conf->config($i->key) ) ? ' SELECTED' : '' %>><% $label %>
+% } 
+% my $curvalue = $conf->config($i->key);
+%                 if ( $conf->exists($i->key) && $curvalue
+%                      && ! $hash{$curvalue}
+%                    ) {
+%              
+
+              
+                   <option value="<% $conf->config($i->key) %>" SELECTED><% exists( $hash{ $conf->config($i->key) } ) ? $hash{ $conf->config($i->key) } : $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' )  { %>
+% } elsif ( $type eq 'editlist' ) { 
+
+
             <script>
-              function doremove<%= $i->key. $n %>() {
-                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+              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);
+                    deleteOption<% $i->key. $n %>(fromObject,i);
                 }
               }
-              function deleteOption<%= $i->key. $n %>(object,index) {
+              function deleteOption<% $i->key. $n %>(object,index) {
                 object.options[index] = null;
               }
-              function selectall<%= $i->key. $n %>() {
-                fromObject = document.OneTrueForm.<%= $i->key. $n %>;
+              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) {
+              function doadd<% $i->key. $n %>(object) {
                 var myvalue = "";
-                <% if ( defined($i->editlist_parts) ) { %>
+% if ( defined($i->editlist_parts) ) { 
+% foreach my $pnum ( 0 .. scalar(@{$i->editlist_parts})-1 ) { 
 
-                  <% 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;
+% 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;
-                <% } %>
+% } 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;
+                var length = object.<% $i->key. $n %>.length;
+                object.<% $i->key. $n %>.options[length] = optionName;
               }
             </script>
-            <select multiple size=5 name="<%= $i->key. $n %>">
+            <select multiple size=5 name="<% $i->key. $n %>">
             <option selected>----------------------------------------------------------------</option>
-            <% foreach my $line ( $conf->config($i->key) ) { %>
-              <option value="<%= $line %>"><%= $line %></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 %>);
-                    SafeAddOnSubmit(selectall<%= $i->key. $n %>);</script>
+            <input type="button" value="remove selected" onClick="doremove<% $i->key. $n %>()">
+            <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} ) { %>
+            <% 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' ) { %>
-                  <%= $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>
-                  <% } %>
+% 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>
-                <% } %>
+% } else { 
+
+                  <font color="#ff0000">unknown type <% $part->type %></font>
+% } 
+
                 </td>
-              <% $pnum++; } %>
-            <% } else { %>
-              <td><input type="text" name="add<%= $i->key. $n %>_0"></td>
-            <% } %>
-            <td><input type="button" value="add" onClick="doadd<%= $i->key. $n %>(this.form)"></td>
+% $pnum++; } 
+% } else { 
+
+              <td><input type="text" name="add<% $i->key. $n %>_0"></td>
+% } 
+
+            <td><input type="button" value="add" onClick="doadd<% $i->key. $n %>(this.form)"></td>
             </tr></table>
-          <% } else { %>
-            <font color="#ff0000">unknown type <%= $type %></font>
-          <% } %>
-        <% $n++; } %>
+% } else { 
+
+
+            <font color="#ff0000">unknown type <% $type %></font>
+% } 
+% $n++; } 
+
       </td>
-      <td><a name="<%= $i->key %>">
-        <b><%= $i->key %></b> - <%= $i->description %>
+      <td><a name="<% $i->key %>">
+        <b><% $i->key %></b> - <% $i->description %>
       </a></td>
     </tr>
-  <% } %>
+% } 
+
   </table><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>
+% } 
 
-<% } %>
 
 </form>