1 files changed, 53 insertions, 56 deletions
diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 3e49b4f99..0210d85a7 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -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>