[freeside-commits] freeside/httemplate/config config-delete.cgi, NONE, 1.1 config-download.cgi, 1.2, 1.3 config-process.cgi, 1.11, 1.12 config-view.cgi, 1.16, 1.17 config.cgi, 1.21, 1.22
Jeff Finucane,420,,
jeff at wavetail.420.am
Wed Jul 18 11:07:41 PDT 2007
Update of /home/cvs/cvsroot/freeside/httemplate/config
In directory wavetail:/tmp/cvs-serv12320/httemplate/config
Modified Files:
config-download.cgi config-process.cgi config-view.cgi
config.cgi
Added Files:
config-delete.cgi
Log Message:
config in database cleanup, editing, and agent-specific config (452, 1419)
Index: config-download.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-download.cgi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- config-download.cgi 27 Feb 2007 22:10:25 -0000 1.2
+++ config-download.cgi 18 Jul 2007 18:07:38 -0000 1.3
@@ -5,14 +5,24 @@
%http_header('Content-Type' => 'application/x-unknown' );
%
%die "No configuration variable specified (bad URL)!" # umm
-% unless $cgi->keywords;
-%my($query) = $cgi->keywords;
-%$query =~ /^([\w -\)+-\/@;:?=[\]]+)$/;
+% unless $cgi->param('key');
+%$cgi->param('key') =~ /^([-\w.]+)$/;
%my $name = $1;
%
+%my $agentnum;
+%if ($cgi->param('agentnum') =~ /^(\d+)$/) {
+% $agentnum = $1;
+%}
+%
%http_header('Content-Disposition' => "attachment; filename=$name" );
-% print $conf->config_binary($name);
+% print $conf->config_binary($name, $agentnum);
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $agentnum;
+if ($cgi->param('agentnum') =~ /^(\d+)$/) {
+ $agentnum = $1;
+}
+
</%init>
Index: config.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config.cgi,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- config.cgi 27 Feb 2007 01:51:52 -0000 1.21
+++ config.cgi 18 Jul 2007 18:07:38 -0000 1.22
@@ -1,4 +1,5 @@
-<% include("/elements/header.html",'Edit Configuration', menubar( 'Main Menu' => $p ) ) %>
+<% include("/elements/header-popup.html", $title) %>
+
<SCRIPT>
var gSafeOnload = new Array();
var gSafeOnsubmit = new Array();
@@ -18,250 +19,286 @@
gSafeOnsubmit[i]();
}
</SCRIPT>
-% my $conf = new FS::Conf; my @config_items = $conf->config_items;
+% if ( $cgi->param('error') ) {
+ <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
+ <BR><BR>
+% }
-<form name="OneTrueForm" action="config-process.cgi" METHOD="POST" enctype="multipart/form-data" onSubmit="SafeOnsubmit()">
-% foreach my $section ( qw(required billing username password UI session
-% shell BIND
-% ),
-% '', 'deprecated') {
+<FORM NAME="OneTrueForm" ACTION="config-process.cgi" METHOD="POST" enctype="multipart/form-data" onSubmit="SafeOnsubmit()">
+<INPUT TYPE="hidden" NAME="agentnum" VALUE="<% $agentnum %>">
+<INPUT TYPE="hidden" NAME="key" VALUE="<% $key %>">
- <A NAME="<% $section || 'unclassified' %>"></A>
- <FONT SIZE="-2">
-% foreach my $nav_section ( qw(required billing username password UI session
-% shell BIND
-% ),
-% '', 'deprecated') {
-% if ( $section eq $nav_section ) {
+Setting <% $key %>
- [<A NAME="not<% $nav_section || 'unclassified' %>" style="background-color: #cccccc"><% ucfirst($nav_section || 'unclassified') %></A>]
-% } else {
+<table><tr><td>
- [<A HREF="#<% $nav_section || 'unclassified' %>"><% ucfirst($nav_section || 'unclassified') %></A>]
-% }
-% }
+% my $n = 0;
+% foreach my $type ( ref($config_item->type) ? @{$config_item->type} : $config_item->type ) {
+% if ( $type eq '' ) {
- </FONT><BR>
- <% 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) {
+ <font color="#ff0000">no type</font>
- <tr>
- <td>
-% my $n = 0;
-% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
-% #warn $i->key unless defined($type);
+% } elsif ( $type eq 'binary' ) {
+
+ Filename <input type="file" name="<% "$key$n" %>">
+
+% } elsif ( $type eq 'textarea' ) {
+
+ <textarea name="<% "$key$n" %>" rows=5><% join("\n", $conf->config($key, $agentnum)) %></textarea>
+
+% } elsif ( $type eq 'checkbox' ) {
+
+ <input name="<% "$key$n" %>" type="checkbox" value="1"
+ <% $conf->exists($key, $agentnum) ? 'CHECKED' : '' %> >
+
+% } elsif ( $type eq 'text' ) {
+
+ <input name="<% "$key$n" %>" type="text" value="<% $conf->exists($key, $agentnum) ? $conf->config($key, $agentnum) : '' %>">
+
+% } elsif ( $type eq 'select' || $type eq 'selectmultiple' ) {
+
+ <select name="<% "$key$n" %>" <% $type eq 'selectmultiple' ? 'MULTIPLE' : '' %>>
+
+%
+% my %hash = ();
+% if ( $config_item->select_enum ) {
+% tie %hash, 'Tie::IxHash',
+% '' => '', map { $_ => $_ } @{ $config_item->select_enum };
+% } elsif ( $config_item->select_hash ) {
+% if ( ref($config_item->select_hash) eq 'ARRAY' ) {
+% tie %hash, 'Tie::IxHash',
+% '' => '', @{ $config_item->select_hash };
+% } else {
+% tie %hash, 'Tie::IxHash',
+% '' => '', %{ $config_item->select_hash };
+% }
+% } else {
+% %hash = ( '' => 'WARNING: neither select_enum nor select_hash specified in Conf.pm for configuration option "'. $key. '"' );
+% }
+%
+% my %saw = ();
+% foreach my $value ( keys %hash ) {
+% local($^W)=0; next if $saw{$value}++;
+% my $label = $hash{$value};
%
-% if ( $type eq '' ) {
+ <option value="<% $value %>"
- <font color="#ff0000">no type</font>
-% } elsif ( $type eq 'binary' ) {
+% if ( $value eq $conf->config($key, $agentnum)
+% || ( $type eq 'selectmultiple'
+% && grep { $_ eq $value } $conf->config($key, $agentnum) ) ) {
+ SELECTED
- Filename <input type="file" name="<% $i->key. $n %>">
-% } elsif ( $type eq 'textarea' ) {
+% }
+ ><% $label %>
- <textarea name="<% $i->key. $n %>" rows=5><% "\n". join("\n", $conf->config($i->key) ) %></textarea>
-% } elsif ( $type eq 'checkbox' ) {
+% }
+% my $curvalue = $conf->config($key, $agentnum);
+% if ( $conf->exists($key, $agentnum) && $curvalue && ! $hash{$curvalue} ) {
+ <option value="<% $curvalue %>" SELECTED>
- <input name="<% $i->key. $n %>" type="checkbox" value="1"<% $conf->exists($i->key) ? ' CHECKED' : '' %>>
-% } elsif ( $type eq 'text' ) {
+% if ( exists( $hash{ $conf->config($key, $agentnum) } ) ) {
+ <% $hash{ $conf->config($key, $agentnum) } %>
- <input name="<% $i->key. $n %>" type="<% $type %>" value="<% $conf->exists($i->key) ? $conf->config($i->key) : '' %>">
-% } elsif ( $type eq 'select' || $type eq 'selectmultiple' ) {
+% }else{
-
- <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. '"' );
-% }
+ <% $curvalue %>
+
+% }
+% }
+
+ </select>
+
+% } elsif ( $type eq 'select-sub' ) {
+
+ <select name="<% "$key$n" %>"><option value="">
+
+% my %options = &{$config_item->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($key, $agentnum) ? 'SELECTED' : '' %>><% $value %>: <% $options{$value} %>
+
+% }
+% my $curvalue = $conf->config($key, $agentnum);
+% if ( $conf->exists($key, $agentnum) && $curvalue && ! $options{$curvalue} ) {
+
+ <option value="<% $curvalue %>" SELECTED> <% $curvalue %>: <% &{ $config_item->option_sub }( $curvalue ) %>
+
+% }
+
+ </select>
+
+% } elsif ( $type eq 'editlist' ) {
%
-% my %saw = ();
-% foreach my $value ( keys %hash ) {
-% local($^W)=0; next if $saw{$value}++;
-% my $label = $hash{$value};
-%
+ <script>
+ function doremove<% "$key$n" %>() {
+ fromObject = document.OneTrueForm.<% "$key$n" %>;
+ for (var i=fromObject.options.length-1;i>-1;i--) {
+ if (fromObject.options[i].selected)
+ deleteOption<% "$key$n" %>(fromObject,i);
+ }
+ }
+ function deleteOption<% "$key$n" %>(object,index) {
+ object.options[index] = null;
+ }
+ function selectall<% "$key$n" %>() {
+ fromObject = document.OneTrueForm.<% "$key$n" %>;
+ for (var i=fromObject.options.length-1;i>-1;i--) {
+ fromObject.options[i].selected = true;
+ }
+ }
+ function doadd<% "$key$n" %>(object) {
+ var myvalue = "";
+% if ( defined($config_item->editlist_parts) ) {
+% foreach my $pnum ( 0 .. scalar(@{$config_item->editlist_parts})-1 ) {
- <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}
-% ) {
-%
+ if ( myvalue != "" ) { myvalue = myvalue + " "; }
-
- <option value="<% $conf->config($i->key) %>" SELECTED><% exists( $hash{ $conf->config($i->key) } ) ? $hash{ $conf->config($i->key) } : $conf->config($i->key) %>
-% }
+% if ( $config_item->editlist_parts->[$pnum]{type} eq 'select' ) {
+ myvalue = myvalue + object.add<% "$key${n}_$pnum" %>.options[object.add<% "$key${n}_$pnum" %>.selectedIndex].value
+ <!-- #RESET SELECT?? maybe not... -->
- </select>
-% } elsif ( $type eq 'select-sub' ) {
+% } elsif ( $config_item->editlist_parts->[$pnum]{type} eq 'immutable' ) {
+ myvalue = myvalue + object.add<% "$key${n}_$pnum" %>.value
- <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}++;
-%
+% } else {
- <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)} ) {
+ myvalue = myvalue + object.add<% "$key${n}_$pnum" %>.value
+ object.add<% "$key${n}_$pnum" %>.value = ""
- <option value=<% $conf->config($i->key) %> SELECTED><% $conf->config($i->key) %>: <% &{ $i->option_sub }( $conf->config($i->key) ) %>
-% }
+% }
+% }
+% } else {
- </select>
-% } elsif ( $type eq 'editlist' ) {
+ myvalue = object.add<% "$key${n}_1" %>.value
+% }
- <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 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) ) {
-% foreach my $pnum ( 0 .. scalar(@{$i->editlist_parts})-1 ) {
+ var optionName = new Option(myvalue, myvalue);
+ var length = object.<% "$key$n" %>.length;
+ object.<% "$key$n" %>.options[length] = optionName;
+ }
+ </script>
+ <select multiple size=5 name="<% "$key$n" %>">
+ <option selected>----------------------------------------------------------------</option>
+% foreach my $line ( $conf->config($key, $agentnum) ) {
- if ( myvalue != "" ) { myvalue = myvalue + " "; }
-% if ( $i->editlist_parts->[$pnum]{type} eq 'select' ) {
+ <option value="<% $line %>"><% $line %></option>
- 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 {
+ </select><br>
+ <input type="button" value="remove selected" onClick="doremove<% "$key$n" %>()">
+ <script>SafeAddOnLoad(doremove<% "$key$n" %>);
+ SafeAddOnSubmit(selectall<% "$key$n" %>);
+ </script>
+ <br><% itable() %><tr>
- myvalue = myvalue + object.add<% $i->key. $n . "_$pnum" %>.value;
- object.add<% $i->key. $n. "_$pnum" %>.value = "";
-% }
-% }
-% } else {
+% if ( defined $config_item->editlist_parts ) {
+% my $pnum=0;
+% foreach my $part ( @{$config_item->editlist_parts} ) {
- myvalue = object.add<% $i->key. $n. "_1" %>.value;
-% }
+ <td>
- 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) ) {
+% if ( $part->{type} eq 'text' ) {
- <option value="<% $line %>"><% $line %></option>
-% }
+ <input type="text" name="add<% "$key${n}_$pnum" %>">
- </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>
- <br>
- <% itable() %><tr>
-% if ( defined $i->editlist_parts ) {
-% my $pnum=0; foreach my $part ( @{$i->editlist_parts} ) {
+% } elsif ( $part->{type} eq 'immutable' ) {
- <td>
-% if ( $part->{type} eq 'text' ) {
+ <% $part->{value} %>
+ <input type="hidden" name="add<% "$key${n}_$pnum" %>" value="<% $part->{value} %>">
- <input type="text" name="add<% $i->key. $n."_$pnum" %>">
-% } elsif ( $part->{type} eq 'immutable' ) {
+% } elsif ( $part->{type} eq 'select' ) {
- <% $part->{value} %><input type="hidden" name="add<% $i->key. $n. "_$pnum" %>" value="<% $part->{value} %>">
-% } elsif ( $part->{type} eq 'select' ) {
+ <select name="add<% qq!$key${n}_$pnum! %>">
- <select name="add<% $i->key. $n. "_$pnum" %>">
-% foreach my $key ( keys %{$part->{select_enum}} ) {
+% foreach my $key ( keys %{$part->{select_enum}} ) {
- <option value="<% $key %>"><% $part->{select_enum}{$key} %></option>
-% }
+ <option value="<% $key %>"><% $part->{select_enum}{$key} %></option>
- </select>
-% } else {
+% }
- <font color="#ff0000">unknown type <% $part->type %></font>
-% }
+ </select>
- </td>
-% $pnum++; }
-% } else {
+% } else {
- <td><input type="text" name="add<% $i->key. $n %>_0"></td>
-% }
+ <font color="#ff0000">unknown type <% $part->type %> </font>
- <td><input type="button" value="add" onClick="doadd<% $i->key. $n %>(this.form)"></td>
- </tr></table>
-% } else {
+% }
+ </td>
- <font color="#ff0000">unknown type <% $type %></font>
-% }
-% $n++; }
+% $pnum++;
+% }
+% } else {
- </td>
- <td><a name="<% $i->key %>">
- <b><% $i->key %></b> - <% $i->description %>
- </a></td>
- </tr>
-% }
+ <td><input type="text" name="add<% "$key${n}_0" %>></td>
- </table><br>
+% }
- You may need to restart Apache and/or freeside-queued for configuration
- changes to take effect.<br>
+ <td><input type="button" value="add" onClick="doadd<% "$key$n" %>(this.form)"></td>
+ </tr></table>
- <input type="submit" value="Apply changes"><br><br>
-% }
+% } else {
+ <font color="#ff0000">unknown type $type</font>
-</form>
+% }
+% $n++;
+% }
+
+ </td><td><% $description %></td></tr></table>
+<INPUT TYPE="submit" VALUE="<% $title %>">
+</FORM>
+
+</BODY>
+</HTML>
+<%once>
+my $conf = new FS::Conf;
+my %confitems = map { $_->key => $_ } $conf->config_items;
+</%once>
-</body></html>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my($agentnum, $agent, $title, $action, $key, $value, $config_item,
+ $description, $type);
+
+$action = 'Set';
+
+if ($cgi->param('agentnum') =~ /(\d+)$/) {
+ $agentnum=$1;
+}
+
+if ($agentnum) {
+ $agent = qsearchs('agent', { 'agentnum' => $1 } );
+ die "Agent $agentnum not found!" unless $agent;
+
+ $title = "$action configuration override for ". $agent->agent;
+} else {
+ $title = "$action global configuration";
+}
+
+$cgi->param('key') =~ /^([-.\w]+)$/ or die "illegal configuration item";
+$key=$1;
+$value = $conf->config($key);
+$config_item = $confitems{$key};
+
+$description = $config_item->description;
+$type = $config_item->type;
+
</%init>
--- NEW FILE: config-delete.cgi ---
<%init>
die "access denied\n"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
die "No configuration item specified (bad URL)!" unless $cgi->keywords;
my ($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
my $confnum = $1;
my $conf = qsearchs('conf', {'confnum' => $confnum});
die "Configuration not found!" unless $conf;
$conf->delete;
</%init>
<% $cgi->redirect(popurl(2) . "browse/agent.cgi") %>
Index: config-view.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-view.cgi,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- config-view.cgi 27 Feb 2007 01:48:07 -0000 1.16
+++ config-view.cgi 18 Jul 2007 18:07:38 -0000 1.17
@@ -1,6 +1,22 @@
-<% include("/elements/header.html",'View Configuration', menubar( 'Main Menu' => $p,
- 'Edit Configuration' => 'config.cgi' ) ) %>
-% my $conf = new FS::Conf; my @config_items = $conf->config_items;
+<% include("/elements/header.html",
+ $title,
+ menubar(
+ 'Main Menu' => $p,
+ 'View all agents' => $p.'browse/agent.cgi',
+ )
+ )
+%>
+
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/iframecontentmws.js"></SCRIPT>
+
+% if ($FS::UID::use_confcompat) {
+
+ <FONT SIZE="+1" COLOR="#ff0000">CONFIGURATION NOT STORED IN DATABASE -- USING COMPATIBILITY MODE</FONT><BR><BR>
+%}
+%
% foreach my $section ( qw(required billing username password UI session
% shell BIND
% ),
@@ -31,7 +47,7 @@
% foreach my $i (grep $_->section eq $section, @config_items) {
<tr>
- <td><a name="<% $i->key %>">
+ <td><a href="javascript:void(0);" onClick="overlib( OLiframeContent('config.cgi?key=<% $i->key %>;agentnum=<% $agentnum %>', 522, 336, 'config_popup' ), CAPTION, 'Enter configuration value', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;" name="<% $i->key %>">
<b><% $i->key %></b> - <% $i->description %>
</a></td>
<td><table border=0>
@@ -45,8 +61,8 @@
% } elsif ( $type eq 'binary' ) {
<tr>
- <% $conf->exists($i->key)
- ? qq!<a href="config-download.cgi?!. $i->key. qq!">download</a>!
+ <% $conf->exists($i->key, $agentnum)
+ ? qq!<a href="config-download.cgi?key=!. $i->key. ';agentnum='. $agentnum. qq!">download</a>!
: 'empty'
%>
</tr>
@@ -57,27 +73,27 @@
<tr>
<td bgcolor="#ffffff">
<pre>
-<% encode_entities(join("\n", $conf->config($i->key) ) ) %>
+<% encode_entities(join("\n", $conf->config($i->key, $agentnum) ) ) %>
</pre>
</td>
</tr>
% } elsif ( $type eq 'checkbox' ) {
<tr>
- <td bgcolor="#<% $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
+ <td bgcolor="#<% $conf->exists($i->key, $agentnum) ? '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) : '' %>
+ <% $conf->exists($i->key, $agentnum) ? $conf->config($i->key, $agentnum) : '' %>
</td></tr>
% } elsif ( $type eq 'select-sub' ) {
<tr>
<td bgcolor="#ffffff">
- <% $conf->config($i->key) %>:
- <% &{ $i->option_sub }( $conf->config($i->key) ) %>
+ <% $conf->config($i->key, $agentnum) %>:
+ <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) %>
</td>
</tr>
% } else {
@@ -100,4 +116,23 @@
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my ($conf, $title, @config_items, $agentnum);
+
+if ($cgi->param('agentnum') =~ /^(\d+)$/) {
+ $agentnum = $1;
+}
+
+if ($agentnum) {
+ my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+ die "Agent $agentnum not found!" unless $agent;
+
+ $title = "Configuration for ". $agent->agent;
+} else {
+ $title = 'Global Configuration';
+}
+
+$conf = new FS::Conf;
+ at config_items = grep { $agentnum ? $_->per_agent : 1 } $conf->config_items;
+
</%init>
Index: config-process.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/config/config-process.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config-process.cgi 27 Feb 2007 01:48:07 -0000 1.11
+++ config-process.cgi 18 Jul 2007 18:07:38 -0000 1.12
@@ -2,69 +2,66 @@
die "access denied\n"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-# errant GET/POST protection
-my $Vars = scalar($cgi->Vars);
-my $num_Vars = scalar(keys %$Vars);
-die "only received $num_Vars params; errant or truncated GET/POST?".
- " aborting - not updating config\n"
- unless $num_Vars > 100;
-
my $conf = new FS::Conf;
$FS::Conf::DEBUG = 1;
my @config_items = $conf->config_items;
+my %confitems = map { $_->key => $_ } $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) ne '' ) {
- my $value = $cgi->param($i->key. $n);
- $value =~ s/\r\n/\n/g; #browsers?
- $conf->set($i->key, $value);
- } else {
- $conf->delete($i->key);
- }
- } elsif ( $type eq 'binary' ) {
- if ( defined($cgi->param($i->key. $n)) && $cgi->param($i->key. $n) ) {
- my $fh = $cgi->upload($i->key. $n);
- if (defined($fh)) {
- local $/;
- $conf->set_binary($i->key, <$fh>);
- }
- }else{
- warn "Condition failed for " . $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' || $type eq 'select' || $type eq 'select-sub' ) {
- if ( $cgi->param($i->key. $n) ne '' ) {
- $conf->set($i->key, $cgi->param($i->key. $n));
- } 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);
+my $agentnum = $cgi->param('agentnum');
+my $key = $cgi->param('key');
+my $i = $confitems{$key};
+
+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) ne '' ) {
+ my $value = $cgi->param($i->key.$n);
+ $value =~ s/\r\n/\n/g; #browsers?
+ $conf->set($i->key, $value, $agentnum);
+ } else {
+ $conf->delete($i->key, $agentnum);
+ }
+ } elsif ( $type eq 'binary' ) {
+ if ( defined($cgi->param($i->key.$n)) && $cgi->param($i->key.$n) ) {
+ my $fh = $cgi->upload($i->key.$n);
+ if (defined($fh)) {
+ local $/;
+ $conf->set_binary($i->key, <$fh>, $agentnum);
}
+ }else{
+ warn "Condition failed for " . $i->key;
+ }
+ } elsif ( $type eq 'checkbox' ) {
+ if ( defined $cgi->param($i->key.$n) ) {
+ push @touch, $i->key;
+ } else {
+ push @delete, $i->key;
+ }
+ } elsif ( $type eq 'text' || $type eq 'select' || $type eq 'select-sub' ) {
+ if ( $cgi->param($i->key.$n) ne '' ) {
+ $conf->set($i->key, $cgi->param($i->key.$n), $agentnum);
} else {
+ $conf->delete($i->key, $agentnum);
+ }
+ } 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) ]} ), $agentnum);
+ } else {
+ $conf->delete($i->key, $agentnum);
}
- $n++;
}
- # warn @touch;
- $conf->touch($_) foreach @touch;
- $conf->delete($_) foreach @delete;
+ $n++;
}
+# warn @touch;
+$conf->touch($_, $agentnum) foreach @touch;
+$conf->delete($_, $agentnum) foreach @delete;
+
</%init>
-<% $cgi->redirect("config-view.cgi") %>
+<% header('Configuration set') %>
+ <SCRIPT TYPE="text/javascript">
+ window.top.location.reload();
+ </SCRIPT>
+ </BODY></HTML>
More information about the freeside-commits
mailing list