Fix to default to mail_location

https://forum.virtualmin.com/t/bug-in-webmin-dovecot-mail-files-config/124425?u=ilia
webmin · Jan 12, 2024 · f244805 · f244805
1 parent 26cb81a
commit f244805
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/dovecot/edit_mail.cgi b/dovecot/edit_mail.cgi
@@ -10,11 +10,11 @@ print &ui_table_start($text{'mail_header'}, "width=100%", 4);
 
 # Mail file location. Old versions used default_mail_env, new uses mail_location
 $envmode = 4;
-if (&find("mail_location", $conf, 2)) {
-	$env = &find_value("mail_location", $conf);
+if (&find("default_mail_env", $conf, 2)) {
+	$env = &find_value("default_mail_env", $conf);
 	}
 else {
-	$env = &find_value("default_mail_env", $conf);
+	$env = &find_value("mail_location", $conf);
 	}
 if ($env =~ s/:INDEX=([^:]+)//) {
 	$index = $1;

diff --git a/dovecot/save_mail.cgi b/dovecot/save_mail.cgi
@@ -31,11 +31,11 @@ if ($in{'controlmode'}) {
 	$env .= ":CONTROL=".$in{'control'};
 	}
 
-if (&find("mail_location", $conf, 2)) {
-	&save_directive($conf, "mail_location", $env eq "" ? undef : $env);
+if (&find("default_mail_env", $conf, 2)) {
+	&save_directive($conf, "default_mail_env", $env eq "" ? undef : $env);
 	}
 else {
-	&save_directive($conf, "default_mail_env", $env eq "" ? undef : $env);
+	&save_directive($conf, "mail_location", $env eq "" ? undef : $env);
 	}
 
 # Idle intervals