ui-lib conversion of more maps

diff --git a/postfix/header.cgi b/postfix/header.cgi
index bf1a4c7..5460354 100755 (executable)
--- a/postfix/header.cgi
+++ b/postfix/header.cgi
@@ -22,34 +22,26 @@ require './postfix-lib.pl';
 $access{'header'} || &error($text{'header_ecannot'});
 &ui_print_header(undef, $text{'header_title'}, "", "header");
 
-
-# alias general options
-
-print "<form action=save_opts_header.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'header_title'}</b></td></tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+# Start of header checks for
+print &ui_form_start("save_opts_header.cgi");
+print &ui_table_start($text{'header_title'}, "width=100%", 2);
 
 $none = $text{'opts_none'};
+&option_mapfield("header_checks", 60, $none);
 
-print "<tr>\n";
-&option_radios_freefield("header_checks", 60, $none);
-print "</tr>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
 
-print "</table></td></tr></table><p>\n";
-print "<input type=submit value=\"$text{'opts_save'}\"></form>\n";
+# Header map contents
 print &ui_hr();
-print "<br>\n";
-
-
 if (&get_current_value("header_checks") eq "")
 {
-    print ($text{'no_map'}."<br><br>");
+    print $text{'no_map'},"<p>\n";
 }
 else
 {
     &generate_map_edit("header_checks", $text{'map_click'}." ".
-                      "<font size=\"-1\">".&hlink("$text{'help_map_format'}", "header")."</font>\n<br>\n", 1,
+                      &hlink($text{'help_map_format'}, "header"), 1,
                       $text{'header_name'}, $text{'header_value'});
 }
 

diff --git a/postfix/relocated.cgi b/postfix/relocated.cgi
index 71e66a0..13dd3a6 100755 (executable)
--- a/postfix/relocated.cgi
+++ b/postfix/relocated.cgi
@@ -22,33 +22,27 @@ require './postfix-lib.pl';
 $access{'relocated'} || &error($text{'relocated_ecannot'});
 &ui_print_header(undef, $text{'relocated_title'}, "", "relocated");
 
-# alias general options
-
-print "<form action=save_opts_relocated.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'relocated_title'}</b></td></tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+# Relocated map form start
+print &ui_form_start("save_opts_relocated.cgi");
+print &ui_table_start($text{'relocated_title'}, "width=100%", 2);
 
 $none = $text{'opts_none'};
-
-print "<tr>\n";
 &option_mapfield("relocated_maps", 60, $none);
-print "</tr>\n";
-
-print "</table></td></tr></table><p>\n";
-print "<input type=submit value=\"$text{'opts_save'}\"></form>\n";
-print &ui_hr();
-print "<br>\n";
 
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
 
+# Map contents
+print &ui_hr();
 if (&get_current_value("relocated_maps") eq "")
 {
-    print ($text{'no_map'}."<br><br>");
+    print $text{'no_map'},"<p>\n";
 }
 else
 {
     &generate_map_edit("relocated_maps", $text{'map_click'}." ".
-                      "<font size=\"-1\">".&hlink("$text{'help_map_format'}", "relocated")."</font>\n<br>\n");
+                      &hlink($text{'help_map_format'}, "relocated"));
 }
 
 &ui_print_footer("", $text{'index_return'});
+

diff --git a/postfix/transport.cgi b/postfix/transport.cgi
index 4c66860..343a444 100755 (executable)
--- a/postfix/transport.cgi
+++ b/postfix/transport.cgi
@@ -22,35 +22,26 @@ require './postfix-lib.pl';
 $access{'transport'} || &error($text{'transport_ecannot'});
 &ui_print_header(undef, $text{'transport_title'}, "", "transport");
 
-
-
-# alias general options
-
-print "<form action=save_opts_transport.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'transport_title'}</b></td></tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+# Start of transport form
+print &ui_form_start("save_opts_transport.cgi");
+print &ui_table_start($text{'transport_title'}, "width=100%", 2);
 
 $none = $text{'opts_none'};
-
-print "<tr>\n";
 &option_mapfield("transport_maps", 60, $none);
-print "</tr>\n";
-
-print "</table></td></tr></table><p>\n";
-print "<input type=submit value=\"$text{'opts_save'}\"></form>\n";
-print &ui_hr();
-print "<br>\n";
 
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
 
+# Transport map contents
+print &ui_hr();
 if (&get_current_value("transport_maps") eq "")
 {
-    print ($text{'no_map'}."<br><br>");
+    print $text{'no_map'},"<p>\n";
 }
 else
 {
     &generate_map_edit("transport_maps", $text{'map_click'}." ".
-                      "<font size=\"-1\">".&hlink("$text{'help_map_format'}", "transport")."</font>\n<br>\n");
+                      &hlink($text{'help_map_format'}, "transport"));
 }
 
 &ui_print_footer("", $text{'index_return'});