X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig-process.cgi;h=3dcb1d3ef8be8ba0a753a62f1583d65f52bfb4c9;hp=c96f8d44d86df77ccf3b3d9c6c4e2df10ce80a03;hb=c3da5cf1caa244937d280e0f406927103beef148;hpb=dad1e2689ba5ff448bf1bbc9a586023137864d12

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index c96f8d44d..3dcb1d3ef 100644
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -1,4 +1,31 @@
-<% header('Configuration set') %>
+%if ( scalar(@error) ) {
+%
+%  my $url = popurl(1)."config.cgi";
+%  if ( length($cgi->query_string) > 1920 ) { #stupid IE 2083 URL limit
+%
+%    my $session = int(rand(4294967296)); #XXX
+%    my $pref = new FS::access_user_pref({
+%      'usernum'    => $FS::CurrentUser::CurrentUser->usernum,
+%      'prefname'   => "redirect$session",
+%      'prefvalue'  => $cgi->query_string,
+%      'expiration' => time + 3600, #1h?  1m?
+%    });
+%    my $pref_error = $pref->insert;
+%    if ( $pref_error ) {
+%      die "FATAL: couldn't even set redirect cookie: $pref_error".
+%          " attempting to set redirect$session to ". $cgi->query_string."\n";
+%    }
+%
+<% $cgi->redirect("$url?redirect=$session") %>
+%
+%  } else {
+%
+<% $cgi->redirect("$url?". $cgi->query_string ) %>
+%
+%  }
+%
+%} else {
+<& /elements/header-popup.html, 'Configuration set' &>
   <SCRIPT TYPE="text/javascript">
 %   my $n = 0;
 %   foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
@@ -38,7 +65,7 @@
 
 %     } elsif ( $type eq 'text' || $type eq 'select' ) {
         configCell.innerHTML = <% $conf->exists($i->key, $agentnum) ? $conf->config($i->key, $agentnum) : '' |js_string %>;
-%     } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class)$/ && ! $i->multiple ) {
+%     } elsif ( $type =~ /^select-(part_svc|part_pkg|pkg_class|agent)$/ && ! $i->multiple ) {
 %       my $table = $1;
 %       my $namecol = $namecol{$table};
 %       my $pkey = dbdef->table($table)->primary_key;
@@ -46,7 +73,7 @@
 %       my $record = qsearchs($table, { $pkey => $key });
 %       my $value = $record ? "$key: ".$record->$namecol() : $key;
         configCell.innerHTML = <% $value |js_string %>;
-%     } elsif ( $type eq 'select-sub' ) {
+%     } elsif ( $type eq 'select-sub' && ! $i->multiple ) {
         configCell.innerHTML =
           <% $conf->config($i->key, $agentnum) |js_string %> + ': ' +
           <% &{ $i->option_sub }( $conf->config($i->key, $agentnum) ) |js_string %>;
@@ -61,12 +88,14 @@
   </SCRIPT>
 </BODY>
 </HTML>
+%}
 <%once>
 #false laziness w/config-view.cgi
 my %namecol = (
   'part_svc'  => 'svc',
   'part_pkg'  => 'pkg',
   'pkg_class' => 'classname',
+  'agent'     => 'agent',
 );
 </%once>
 <%init>
@@ -74,13 +103,15 @@ my %namecol = (
 my $curuser = $FS::CurrentUser::CurrentUser;
 die "access denied\n" unless $curuser->access_right('Configuration');
 
-my $conf = new FS::Conf;
+my $locale = $cgi->param('locale') || '';
+
+my $conf = new FS::Conf { 'locale' => $locale };
 
 if ( $conf->exists('disable_settings_changes') ) {
   my @changers = split(/\s*,\s*/, $conf->config('disable_settings_changes'));
   my %changers = map { $_=>1 } @changers;
   unless ( $changers{$curuser->username} ) {
-    errorpage("Disabled in web demo");
+    errorpage_popup("Disabled in web demo");
     die "shouldn't be reached";
   }
 }
@@ -94,6 +125,7 @@ my $agentnum = $cgi->param('agentnum');
 my $key = $cgi->param('key');
 my $i = $confitems{$key};
 
+my @error = ();
 my @touch = ();
 my @delete = ();
 my $n = 0;
@@ -103,6 +135,8 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
     if ( $cgi->param($i->key.$n) ne '' ) {
       my $value = $cgi->param($i->key.$n);
       $value =~ s/\r\n/\n/g; #browsers?
+      my $error = &{$i->validate}($value, $n) if $i->validate;
+      push @error, $error if $error;
       $conf->set($i->key, $value, $agentnum);
     } else {
       $conf->delete($i->key, $agentnum);
@@ -110,6 +144,8 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
   } elsif ( $type eq 'binary' || $type eq 'image' ) {
     if ( defined($cgi->param($i->key.$n)) && $cgi->param($i->key.$n) ) {
       my $fh = $cgi->upload($i->key.$n);
+      my $error = &{$i->validate}($fh, $n) if $i->validate;
+      push @error, $error if $error;
       if (defined($fh)) {
         local $/;
         $conf->set_binary($i->key, <$fh>, $agentnum);
@@ -125,16 +161,20 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
     }
   } elsif (
     $type =~ /^(editlist|selectmultiple)$/
-    or ( $type =~ /^select(-(sub|part_svc|part_pkg|pkg_class))?$/
+    or ( $type =~ /^select(-(sub|part_svc|part_pkg|pkg_class|agent))?$/
          || $i->multiple )
   ) {
     if ( scalar(@{[ $cgi->param($i->key.$n) ]}) ) {
+      my $error = &{$i->validate}([ $cgi->param($i->key.$n) ], $n) if $i->validate;
+      push @error, $error if $error;
       $conf->set($i->key, join("\n", @{[ $cgi->param($i->key.$n) ]} ), $agentnum);
     } else {
       $conf->delete($i->key, $agentnum);
     }
-  } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg|pkg_class))?)$/ ) {
+  } elsif ( $type =~ /^(text|select(-(sub|part_svc|part_pkg|pkg_class|agent))?)$/ ) {
     if ( $cgi->param($i->key.$n) ne '' ) {
+      my $error = &{$i->validate}($cgi->param($i->key.$n), $n) if $i->validate;
+      push @error, $error if $error;
       $conf->set($i->key, $cgi->param($i->key.$n), $agentnum);
     } else {
       $conf->delete($i->key, $agentnum);
@@ -146,4 +186,8 @@ foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
 $conf->touch($_, $agentnum) foreach @touch;
 $conf->delete($_, $agentnum) foreach @delete;
 
+if (scalar(@error)) {
+  $cgi->param('error', join(' ', @error));
+}
+
 </%init>