Fix setting an actual recommended value for pop3_uidl_format

iliaross · iliaross · commit a945b600cfc4 · 2025-08-22T19:44:17.000+03:00
diff --git a/lib/Virtualmin/Config/Plugin/Dovecot.pm b/lib/Virtualmin/Config/Plugin/Dovecot.pm
@@ -67,11 +67,8 @@ sub actions {
       dovecot::save_directive($conf, "default_mail_env",
         "maildir:~/Maildir" . $indexes);
     }
-    if (dovecot::find("pop3_uidl_format", $conf, 2)) {
-      dovecot::save_directive($conf, "pop3_uidl_format", "%08Xu%08Xv");
-    }
-    elsif (dovecot::find("pop3_uidl_format", $conf, 2, "pop3")) {
-      dovecot::save_directive($conf, "pop3_uidl_format", "%08Xu%08Xv", "pop3");
+    if (my $uidl_format = dovecot::find("pop3_uidl_format", $conf, 2)) {
+      dovecot::save_directive($conf, "pop3_uidl_format", $uidl_format->{value});
     }
     dovecot::save_directive($conf, "disable_plaintext_auth", "no");
     my $am = dovecot::find_value("auth_mechanisms", $conf, 2);

Original file line number	Diff line number	Diff line change
`@@ -67,11 +67,8 @@ sub actions {`
`67`	`67`	`dovecot::save_directive($conf, "default_mail_env",`
`68`	`68`	`"maildir:~/Maildir" . $indexes);`
`69`	`69`	`}`
`70`		`- if (dovecot::find("pop3_uidl_format", $conf, 2)) {`
`71`		`- dovecot::save_directive($conf, "pop3_uidl_format", "%08Xu%08Xv");`
`72`		`- }`
`73`		`- elsif (dovecot::find("pop3_uidl_format", $conf, 2, "pop3")) {`
`74`		`- dovecot::save_directive($conf, "pop3_uidl_format", "%08Xu%08Xv", "pop3");`
	`70`	`+ if (my $uidl_format = dovecot::find("pop3_uidl_format", $conf, 2)) {`
	`71`	`+ dovecot::save_directive($conf, "pop3_uidl_format", $uidl_format->{value});`
`75`	`72`	`}`
`76`	`73`	`dovecot::save_directive($conf, "disable_plaintext_auth", "no");`
`77`	`74`	`my $am = dovecot::find_value("auth_mechanisms", $conf, 2);`