print &ui_table_start($text{'aliasopts_title'}, "width=100%", 2);
# Aliases file
-$none = $text{'opts_none'};
-&option_mapfield("alias_maps", 60, $none);
+&option_mapfield("alias_maps", 60);
# Aliases DB?
-&option_mapfield("alias_database", 60, $none);
+&option_mapfield("alias_database", 60);
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
print "<tr $tb> <td><b>$text{'bcc_title'}</b></td></tr>\n";
print "<tr $cb> <td><table width=100%>\n";
-$none = $text{'opts_none'};
-
print "<tr>\n";
-&option_mapfield("sender_bcc_maps", 60, $none);
+&option_mapfield("sender_bcc_maps", 60);
print "</tr>\n";
print "<tr>\n";
-&option_mapfield("recipient_bcc_maps", 60, $none);
+&option_mapfield("recipient_bcc_maps", 60);
print "</tr>\n";
print "</table></td></tr></table><p>\n";
$access{'body'} || &error($text{'body_ecannot'});
&ui_print_header(undef, $text{'body_title'}, "", "body");
+# Start of body form
+print &ui_form_start("save_opts_body.cgi");
+print &ui_table_start($text{'body_title'}, "width=100%", 2);
-# alias general options
+&option_mapfield("body_checks", 60);
-print "<form action=save_opts_body.cgi>\n";
-print "<table border width=100%>\n";
-print "<tr $tb> <td><b>$text{'body_title'}</b></td></tr>\n";
-print "<tr $cb> <td><table width=100%>\n";
+print &ui_table_end();
+print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
-$none = $text{'opts_none'};
-
-print "<tr>\n";
-&option_radios_freefield("body_checks", 60, $none);
-print "</tr>\n";
-
-print "</table></td></tr></table><p>\n";
-print "<input type=submit value=\"$text{'opts_save'}\"></form>\n";
+# Map contents
print &ui_hr();
-print "<br>\n";
-
-
if (&get_current_value("body_checks") eq "")
{
- print ($text{'no_map'}."<br><br>");
+ print $text{'no_map'},"<p>\n";
}
else
{
&generate_map_edit("body_checks", $text{'map_click'}." ".
- "<font size=\"-1\">".&hlink("$text{'help_map_format'}", "body")."</font>\n<br>\n", 1,
+ &hlink($text{'help_map_format'}, "body"), 1,
$text{'header_name'}, $text{'header_value'});
}
print &ui_form_start("save_opts_canonical.cgi");
print &ui_table_start($text{'canonical_title'}, "width=100%", 2);
-$none = $text{'opts_none'};
-&option_mapfield("canonical_maps", 60, $none);
+&option_mapfield("canonical_maps", 60);
-&option_mapfield("recipient_canonical_maps", 60, $none);
+&option_mapfield("recipient_canonical_maps", 60);
-&option_mapfield("sender_canonical_maps", 60, $none);
+&option_mapfield("sender_canonical_maps", 60);
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
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);
+&option_mapfield("header_checks", 60);
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
opts_default=Default
opts_none=None
+opts_nomap=No map set
+opts_setmap=Map specifications
opts_relayhost=Send outgoing mail via host
opts_direct=Deliver directly
opts_myorigin=What domain to use in outbound mail
print &ui_table_row($help, $rv, $length > 20 ? 3 : 1);
}
-# option_mapfield(name_of_option, length_of_free_field, defaulttext)
+# option_mapfield(name_of_option, length_of_free_field)
# Prints a field for selecting a map, or none
sub option_mapfield
{
&hlink($text{$key}, "opt_".$name) : $text{$key};
my $rv;
$rv .= &ui_oneradio($name."_def", "__DEFAULT_VALUE_IE_NOT_IN_CONFIG_FILE__",
- $_[2], &if_default_value($name));
+ $text{'opts_nomap'}, &if_default_value($name));
+ $rv .= "<br>\n";
$check_free_field = 0 if &if_default_value($name);
shift;
# the free field
- $rv .= &ui_oneradio($name."_def", "__USE_FREE_FIELD__", undef,
- $check_free_field == 1);
+ $rv .= &ui_oneradio($name."_def", "__USE_FREE_FIELD__",
+ $text{'opts_setmap'}, $check_free_field == 1);
$rv .= &ui_textbox($name, $check_free_field == 1 ? $v : undef, $length);
$rv .= &map_chooser_button($name, $name);
print &ui_table_row($help, $rv, $length > 20 ? 3 : 1);
print &ui_form_start("save_opts_relocated.cgi");
print &ui_table_start($text{'relocated_title'}, "width=100%", 2);
-$none = $text{'opts_none'};
-&option_mapfield("relocated_maps", 60, $none);
+&option_mapfield("relocated_maps", 60);
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
print &ui_form_start("save_opts_transport.cgi");
print &ui_table_start($text{'transport_title'}, "width=100%", 2);
-$none = $text{'opts_none'};
-&option_mapfield("transport_maps", 60, $none);
+&option_mapfield("transport_maps", 60);
print &ui_table_end();
print &ui_form_end([ [ undef, $text{'opts_save'} ] ]);
print &ui_form_start("save_opts_virtual.cgi");
print &ui_table_start($text{'virtual_title'}, "width=100%", 2);
-$none = $text{'opts_none'};
-&option_mapfield($virtual_maps, 40, $none);
+&option_mapfield($virtual_maps, 60);
if ($postfix_version >= 2) {
&option_radios_freefield("virtual_alias_domains", 40,