import rt 2.0.14

[freeside.git] / httemplate / config / config-process.cgi

diff --git a/httemplate/config/config-process.cgi b/httemplate/config/config-process.cgi
index 2dc4647..2597132 100644 (file)
--- a/httemplate/config/config-process.cgi
+++ b/httemplate/config/config-process.cgi
@@ -10,8 +10,10 @@
     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));
+        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);
         }
@@ -24,12 +26,18 @@
           #$conf->delete($i->key);
           push @delete, $i->key;
         }
-      } elsif ( $type eq 'text' )  {
-        if ( $cgi->param($i->key. $n) ) {
+      } elsif ( $type eq 'text' || $type eq 'select' )  {
+        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);
+        }
       } else {
       }
       $n++;
@@ -41,4 +49,3 @@
 
 %>
 <%= $cgi->redirect("config-view.cgi") %>
-