michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use proper version comparison function

Browse Source
This commit is contained in:
Jamie Cameron
2017-04-29 16:26:24 -07:00
parent 813e6dd4ad
commit 580578ecbc
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
postfix/delete_queues.cgi
View File

@@ -31,19 +31,19 @@ else {
@files = split(/\0/, $in{'file'}); @files = split(/\0/, $in{'file'});
if ($in{'confirm'} || !$config{'delete_confirm'}) { if ($in{'confirm'} || !$config{'delete_confirm'}) {
# Deleting messages # Deleting messages
if ($postfix_version < 1.1) { if (&compare_version_numbers($postfix_version, 1.1) < 0) {
@qfiles = &recurse_files($config{'mailq_dir'}); @qfiles = &recurse_files($config{'mailq_dir'});
} }
foreach $f (@files) { foreach $f (@files) {
$f =~ /^[A-Za-z0-9]+$/ || next; $f =~ /^[A-Za-z0-9]+$/ || next;
if ($postfix_version >= 1.1) { if (&compare_version_numbers($postfix_version, 1.1) >= 0) {
&system_logged("$config{'postfix_super_command'} -d ".quotemeta($f)." >/dev/null 2>&1 </dev/null"); &system_logged("$config{'postfix_super_command'} -d ".quotemeta($f)." >/dev/null 2>&1 </dev/null");
} }
else { else {
&unlink_file(grep { $_ =~ /\/$f$/ } @qfiles); &unlink_file(grep { $_ =~ /\/$f$/ } @qfiles);
} }
} }
if ($postfix_version < 1.1) { if (&compare_version_numbers($postfix_version, 1.1) < 0) {
&system_logged("$config{'postfix_super_command'} -p >/dev/null 2>&1 </dev/null"); &system_logged("$config{'postfix_super_command'} -p >/dev/null 2>&1 </dev/null");
} }
&webmin_log("delqs", undef, scalar(@files)); &webmin_log("delqs", undef, scalar(@files));

2
postfix/general.cgi
View File

@@ -104,7 +104,7 @@ print &ui_table_start($text{'general_title_others'}, "width=100%", 4);
&option_freefield("process_id_directory", 20); &option_freefield("process_id_directory", 20);
&option_freefield("recipient_delimiter", 20); &option_freefield("recipient_delimiter", 20);
if ($postfix_version < 2.1) { if (&compare_version_numbers($postfix_version, 2.1) < 0) {
&option_freefield("program_directory", 45); &option_freefield("program_directory", 45);
} }

4
postfix/index.cgi
View File

@@ -87,8 +87,8 @@ if ($config{'index_check'} && ($err = &check_postfix())) {
@onames = ( "general", "address_rewriting", "aliases", "canonical", @onames = ( "general", "address_rewriting", "aliases", "canonical",
"virtual", "transport", "relocated", "header", "body", "bcc", "virtual", "transport", "relocated", "header", "body", "bcc",
$postfix_version =~ /^3\./ || &compare_version_numbers($postfix_version, 2.7) > 0 ?
$postfix_version =~ /^2\.(\d+)/ && $1 > 7 ? ( "dependent" ) : ( ), ( "dependent" ) : ( ),
"local_delivery", "resource", "local_delivery", "resource",
"smtpd", "smtp", "sasl", "client", "smtpd", "smtp", "sasl", "client",
"rate", "debug", $postfix_version > 2 ? ( ) : ( "ldap" ), "rate", "debug", $postfix_version > 2 ? ( ) : ( "ldap" ),

2
postfix/map_chooser.cgi
View File

@@ -47,7 +47,7 @@ foreach $tv (@maps) {
&ui_textbox("mpassword_$i", $myconf->{'password'}, 30)); &ui_textbox("mpassword_$i", $myconf->{'password'}, 30));
$mtable .= &ui_table_row($text{'chooser_mdbname'}, $mtable .= &ui_table_row($text{'chooser_mdbname'},
&ui_textbox("mdbname_$i", $myconf->{'dbname'}, 30)); &ui_textbox("mdbname_$i", $myconf->{'dbname'}, 30));
if ($postfix_version >= 2.2) { if (&compare_version_numbers($postfix_version, 2.2) >= 0) {
# Can use custom query # Can use custom query
$mtable .= &ui_table_row($text{'chooser_mquery'}, $mtable .= &ui_table_row($text{'chooser_mquery'},
&ui_opt_textbox("mquery_$i", $myconf->{'query'}, 40, &ui_opt_textbox("mquery_$i", $myconf->{'query'}, 40,

2
postfix/map_chooser_save.cgi
View File

@@ -65,7 +65,7 @@ for($i=0; defined($t = $in{"type_".$i}); $i++) {
&save_backend_config($file, "password", $in{"mpassword_$i"}); &save_backend_config($file, "password", $in{"mpassword_$i"});
# Custom query # Custom query
if ($postfix_version >= 2.2) { if (&compare_version_numbers($postfix_version, 2.2) >= 0) {
if ($in{"mquery_${i}_def"}) { if ($in{"mquery_${i}_def"}) {
&save_backend_config($file, "query", undef); &save_backend_config($file, "query", undef);
} }

2
postfix/save_sasl.cgi
View File

@@ -60,7 +60,7 @@ foreach $o (&list_smtpd_restrictions()) {
&set_current_value("smtpd_relay_restrictions", join(" ", @relay)); &set_current_value("smtpd_relay_restrictions", join(" ", @relay));
# Save SSL options # Save SSL options
if ($postfix_version >= 2.3) { if (&compare_version_numbers($postfix_version, 2.3) >= 0) {
&set_current_value("smtpd_tls_security_level", &set_current_value("smtpd_tls_security_level",
$in{'smtpd_tls_security_level'}); $in{'smtpd_tls_security_level'});
} }

2
postfix/smtp.cgi
View File

@@ -27,7 +27,7 @@ print &ui_table_start($text{'smtp_title'}, "width=100%", 4);
&option_radios_freefield("fallback_relay", 60, $default); &option_radios_freefield("fallback_relay", 60, $default);
&option_yesno("ignore_mx_lookup_error", 'help'); &option_yesno("ignore_mx_lookup_error", 'help');
if ($postfix_version <= 2) { if (&compare_version_numbers($postfix_version, 2) <= 0) {
&option_yesno("smtp_skip_4xx_greeting", 'help'); &option_yesno("smtp_skip_4xx_greeting", 'help');
} }

2
postfix/virtual.cgi
View File

@@ -20,7 +20,7 @@ print &ui_table_start($text{'virtual_title'}, "width=100%", 2);
&option_mapfield($virtual_maps, 60); &option_mapfield($virtual_maps, 60);
if ($postfix_version >= 2) { if (&compare_version_numbers($postfix_version, 2) >= 0) {
&option_radios_freefield("virtual_alias_domains", 40, &option_radios_freefield("virtual_alias_domains", 40,
$text{'virtual_same'}); $text{'virtual_same'});
} }