mirror of
https://github.com/webmin/webmin.git
synced 2026-02-03 14:13:29 +00:00
Fix to improve API name
This commit is contained in:
@@ -555,9 +555,9 @@ return 0 if (!$ver);
|
||||
return &compare_version_numbers($ver, $wantver) >= 0;
|
||||
}
|
||||
|
||||
# version_atmost(ver)
|
||||
# Returns 1 if running at most some version or below
|
||||
sub version_atmost
|
||||
# version_below(ver)
|
||||
# Returns 1 if running below some version
|
||||
sub version_below
|
||||
{
|
||||
local ($wantver) = @_;
|
||||
local $ver = &get_dovecot_version();
|
||||
|
||||
@@ -91,7 +91,7 @@ elsif ($userdb =~ /^sql\s+(.*)/) {
|
||||
else {
|
||||
$other = $userdb;
|
||||
}
|
||||
if (&version_atmost("2.4")) {
|
||||
if (&version_below("2.4")) {
|
||||
print &ui_table_row($text{'login_userdb'},
|
||||
&ui_radio("usermode", $usermode,
|
||||
[ [ "passwd", $text{'login_passwd'}."<br>" ],
|
||||
@@ -181,7 +181,7 @@ else {
|
||||
$pother = $passdb;
|
||||
}
|
||||
|
||||
if (&version_atmost("2.4")) {
|
||||
if (&version_below("2.4")) {
|
||||
print &ui_table_row($text{'login_passdb'},
|
||||
&ui_radio("passmode", $passmode,
|
||||
[ [ "passwd", $text{'login_passwd2'}."<br>" ],
|
||||
|
||||
@@ -107,7 +107,7 @@ print &ui_table_row($text{'mail_change'},
|
||||
[ "", &getdef($dirty, \@opts) ] ]), 3);
|
||||
|
||||
# Permissions on files
|
||||
if (&version_atmost("2")) {
|
||||
if (&version_below("2")) {
|
||||
$umask = &find_value("umask", $conf);
|
||||
print &ui_table_row($text{'mail_umask'},
|
||||
&ui_opt_textbox("umask", $umask, 5, &getdef("umask")), 3);
|
||||
|
||||
@@ -66,7 +66,7 @@ print &ui_table_row($text{'ssl_pass'},
|
||||
[ undef, "nowrap" ]);
|
||||
|
||||
# Parameter regen time
|
||||
if (&version_atmost("2.4")) {
|
||||
if (&version_below("2.4")) {
|
||||
$regen = &find_value("ssl_parameters_regenerate", $conf);
|
||||
print &ui_table_row($text{'ssl_regen'},
|
||||
&ui_opt_textbox("regen", $regen, 5,
|
||||
|
||||
@@ -28,7 +28,7 @@ else {
|
||||
join(" ", split(/\0/, $in{'mechs'})), "auth","default");
|
||||
}
|
||||
|
||||
if (&version_atmost("2.4")) {
|
||||
if (&version_below("2.4")) {
|
||||
# User database
|
||||
$userdb = $in{'usermode'};
|
||||
if ($in{'usermode'} eq 'passwd-file') {
|
||||
|
||||
@@ -66,7 +66,7 @@ else {
|
||||
$in{'change'} ? $in{'change'} : undef);
|
||||
}
|
||||
|
||||
if (&version_atmost("2")) {
|
||||
if (&version_below("2")) {
|
||||
# Umask
|
||||
$in{'umask_def'} || $in{'umask'} =~ /^[0-7]{4}$/ ||
|
||||
&error($text{'mail_eumask'});
|
||||
|
||||
@@ -67,7 +67,7 @@ $in{'pass_def'} || $in{'pass'} =~ /\S/ || &error($text{'ssl_epass'});
|
||||
$in{'pass_def'} ? undef : $in{'pass'});
|
||||
|
||||
# Save SSL parameter regeneration time
|
||||
if (&version_atmost("2.4")) {
|
||||
if (&version_below("2.4")) {
|
||||
$in{'regen_def'} || $in{'regen'} =~ /^\d+$/ ||
|
||||
&error($text{'ssl_eregen'});
|
||||
&save_directive($conf, "ssl_parameters_regenerate",
|
||||
|
||||
Reference in New Issue
Block a user