X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fconfig%2Fconfig.cgi;h=5e73b59e1d822cd652277822e3eba397a4299da5;hb=beab5e8857fa4961c22c7ccc49c9fea333c593a7;hp=485565e8009b5b5c342b2f278a483d3f45aa543f;hpb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;p=freeside.git

diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 485565e80..5e73b59e1 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -20,21 +20,26 @@ function SafeOnsubmit() {
 }
 </SCRIPT>
 
-% if ( $cgi->param('error') ) { 
-  <FONT SIZE="+1" COLOR="#ff0000">Error: <% $cgi->param('error') %></FONT>
-  <BR><BR>
-% } 
+<% include('/elements/error.html') %>
 
 <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 %>">
 
-Setting <% $key %>
+Setting <b><% $key %></b>
+
+% my $description_printed = 0;
+% if ( grep $_ eq 'textarea', @types ) {
+%   $description_printed = 1;
+
+    - <% $description %>
+
+% }
 
 <table><tr><td>
 
 % my $n = 0;
-% foreach my $type ( ref($config_item->type) ? @{$config_item->type} : $config_item->type ) {
+% foreach my $type (@types) {
 %   if ( $type eq '' ) {
 
   <font color="#ff0000">no type</font>
@@ -45,7 +50,7 @@ Setting <% $key %>
 
 %   } elsif ( $type eq 'textarea' ) { 
 
-  <textarea name="<% "$key$n" %>" rows=5><% join("\n", $conf->config($key, $agentnum)) %></textarea>
+  <textarea name="<% "$key$n" %>" rows=12 cols=88 wrap="off"><% join("\n", $conf->config($key, $agentnum)) %></textarea>
 
 %   } elsif ( $type eq 'checkbox' ) { 
 
@@ -54,7 +59,7 @@ Setting <% $key %>
 
 %   } elsif ( $type eq 'text' )  { 
 
-  <input name="<% "$key$n" %>" type="text" value="<% $conf->exists($key, $agentnum) ? $conf->config($key, $agentnum) : '' %>">
+  <input name="<% "$key$n" %>" type="text" value="<% $conf->exists($key, $agentnum) ? $conf->config($key, $agentnum) : '' |h %>">
 
 %   } elsif ( $type eq 'select' || $type eq 'selectmultiple' )  { 
 
@@ -260,7 +265,12 @@ Setting <% $key %>
 % $n++;
 % }
 
-  </td><td><% $description %></td></tr></table>
+  </td>
+% unless ( $description_printed ) {
+    <td><% $description %></td>
+% }
+</tr>
+</table>
 <INPUT TYPE="submit" VALUE="<% $title %>">
 </FORM>
 
@@ -279,15 +289,15 @@ my %confitems = map { $_->key => $_ } @config_items;
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
 
-my($agentnum, $agent, $title, $action, $key, $value, $config_item,
-   $description, $type);
-
-$action = 'Set';
+my $action = 'Set';
 
+my $agentnum = '';
 if ($cgi->param('agentnum') =~ /(\d+)$/) {
   $agentnum=$1;
 }
 
+my $agent = '';
+my $title;
 if ($agentnum) {
   $agent = qsearchs('agent', { 'agentnum' => $1 } );
   die "Agent $agentnum not found!" unless $agent;
@@ -298,11 +308,12 @@ if ($agentnum) {
 }
 
 $cgi->param('key') =~ /^([-.\w]+)$/ or die "illegal configuration item";
-$key=$1;
-$value = $conf->config($key);
-$config_item = $confitems{$key};
+my $key = $1;
+my $value = $conf->config($key);
+my $config_item = $confitems{$key};
 
-$description = $config_item->description;
-$type = $config_item->type;
+my $description = $config_item->description;
+my $config_type = $config_item->type;
+my @types = ref($config_type) ? @$config_type : ($config_type);
 
 </%init>