More ui-libification and form cleanup

diff --git a/sendmail/lang/en b/sendmail/lang/en
index ba65f05..4b70dc2 100644 (file)
--- a/sendmail/lang/en
+++ b/sendmail/lang/en
@@ -319,7 +319,7 @@ gdelete_ecannot=You are not allowed to delete the mapping for $1
 cgs_title=Outgoing Domains
 cgs_ecannot=You are not allowed to edit outgoing domains
 cgs_header=Outgoing address domains
-cgs_desc=Apart from mail sent by local users, sendmail will only perform <a href='$1'>outgoing address</a> mapping for mail from hosts or domains listed in the text box to the right. Thus for an outgoing address entry to work the domain in the from address must be included in this list.
+cgs_desc=Apart from mail sent by local users, sendmail will only perform <a href='$1'>outgoing address</a> mapping for mail from hosts or domains listed in the text box below. Thus for an outgoing address entry to work the domain in the from address must be included in this list.
 cgs_err=Failed to save outgoing domains
 cgs_ehost='$1' is not a valid host or domain name
 cgs_eip='$1' is an IP address, not a domain
@@ -400,7 +400,7 @@ relay_title=Relay Domains
 relay_ecannot=You are not allowed to edit relay domains
 relay_eversion=Only sendmail versions 8.9 and above support the relay domains feature.
 relay_domains=Domains to which relaying is allowed
-relay_desc1=Unless allowed by the <a href='$1'>spam control</a> rules, sendmail will only permit relaying to domains listed in the text box to the left. Incoming mail messages that are not for a local user and not for one of the listed domains will be rejected.
+relay_desc1=Unless allowed by the <a href='$1'>spam control</a> rules, sendmail will only permit relaying to domains listed in the text box below. Incoming mail messages that are not for a local user and not for one of the listed domains will be rejected.
 relay_desc2=If your system is serving as a gateway for several domains that are not directly accessible from outside your network (using the <a href='$1'>domain routing</a> feature), then all those domains should be listed here.
 relay_err=Failed to save relay domains
 relay_edomain='$1' is not a valid domain name

diff --git a/sendmail/list_cgs.cgi b/sendmail/list_cgs.cgi
index c3bd1fc..76714dd 100755 (executable)
--- a/sendmail/list_cgs.cgi
+++ b/sendmail/list_cgs.cgi
@@ -9,17 +9,14 @@ $access{'cgs'} || &error($text{'cgs_ecannot'});
 $conf = &get_sendmailcf();
 @dlist = &get_file_or_config($conf, "G");
 
-print "<form method=post action=save_cgs.cgi enctype=multipart/form-data>\n";
-print "<table cellpadding=5 width=100%><tr><td valign=top nowrap>\n";
-print "<b>$text{'cgs_header'}</b><br>\n";
-print "<textarea name=dlist rows=15 cols=65>",
-       join("\n", @dlist),"</textarea><br>\n";
-print "<input type=submit value=\"$text{'save'}\">\n";
-
-print "</td><td valign=top>\n";
 print &text('cgs_desc', "list_generics.cgi"),"<p>\n";
-print "</td></tr></table>\n";
-print "</form>\n";
+
+print &ui_form_start("save_cgs.cgi", "form-data");
+print &ui_table_start(undef, undef, 2);
+print &ui_table_row(undef,
+       &ui_textarea("dlist", join("\n", @dlist), 15, 80), 2);
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});
 

diff --git a/sendmail/list_relay.cgi b/sendmail/list_relay.cgi
index b141c03..b674f4d 100755 (executable)
--- a/sendmail/list_relay.cgi
+++ b/sendmail/list_relay.cgi
@@ -17,18 +17,15 @@ if ($ver->{'value'} !~ /^(\d+)/ || $1 < 8) {
 
 @dlist = &get_file_or_config($conf, "R");
 
-print "<form method=post action=save_relay.cgi enctype=multipart/form-data>\n";
-print "<table cellpadding=5 width=100%><tr><td valign=top nowrap>\n";
-print "<b>$text{'relay_domains'}</b><br>\n";
-print "<textarea name=dlist rows=15 cols=65>",
-       join("\n", @dlist),"</textarea><br>\n";
-print "<input type=submit value=\"$text{'save'}\">\n";
-
-print "</td><td valign=top>\n";
 print &text('relay_desc1', "list_access.cgi"),"<p>\n";
-print &text('relay_desc2', "list_mailers.cgi"),"<br>\n";
-print "</td></tr></table>\n";
-print "</form>\n";
+print &text('relay_desc2', "list_mailers.cgi"),"<p>\n";
+
+print &ui_form_start("save_relay.cgi", "form-data");
+print &ui_table_start(undef, undef, 2);
+print &ui_table_row(undef,
+       &ui_textarea("dlist", join("\n", @dlist), 15, 80), 2);
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'save'} ] ]);
 
 &ui_print_footer("", $text{'index_return'});