Mercurial Hosting > nabble
changeset 59:f7665d62c5cd
remove bounces@n2.nabble.com
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Wed, 23 Feb 2022 00:34:58 -0700 |
| parents | 41d76bd6268a |
| children | 36b0e32246d0 |
| files | src/nabble/model/ModelHome.java src/nabble/view/web/template/EmailNamespace.java |
| diffstat | 2 files changed, 3 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
diff -r 41d76bd6268a -r f7665d62c5cd src/nabble/model/ModelHome.java --- a/src/nabble/model/ModelHome.java Tue Nov 30 09:32:14 2021 +0200 +++ b/src/nabble/model/ModelHome.java Wed Feb 23 00:34:58 2022 -0700 @@ -218,22 +218,9 @@ public static final String noReply = "no-reply@nabble.com"; - static final String bounces = "bounces@n2.nabble.com"; public static void send(Mail mail) throws MailException { - if( mail.getFrom().getAddrSpec().equals(noReply) ) { - MailHome.getDefaultSmtpServer().sendFrom(mail, bounces); - } else { - MailHome.getDefaultSmtpServer().send(mail); - } - } - - public static void send(Mail mail, String smtpFrom) throws MailException { - if( mail.getFrom().getAddrSpec().equals(noReply) ) { - MailHome.getDefaultSmtpServer().sendFrom(mail, bounces); - } else { - MailHome.getDefaultSmtpServer().sendFrom(mail, smtpFrom); - } + MailHome.getDefaultSmtpServer().send(mail); }
diff -r 41d76bd6268a -r f7665d62c5cd src/nabble/view/web/template/EmailNamespace.java --- a/src/nabble/view/web/template/EmailNamespace.java Tue Nov 30 09:32:14 2021 +0200 +++ b/src/nabble/view/web/template/EmailNamespace.java Wed Feb 23 00:34:58 2022 -0700 @@ -90,7 +90,7 @@ public static final CommandSpec send = new CommandSpec.Builder() .parameters("to", "subject", "text_part") - .optionalParameters("cc", "bcc", "to_name", "from", "from_name", "html_part", "aol_part", "bounce_to", "attachments") + .optionalParameters("cc", "bcc", "to_name", "from", "from_name", "html_part", "aol_part", "attachments") .build(); @Command public void send(IPrintWriter out, Interpreter interp) @@ -144,11 +144,7 @@ setMailContents(alternatives); - String bounceTo = interp.getArgString("bounce_to"); - if (bounceTo == null) - ModelHome.send(mail); - else - ModelHome.send(mail, bounceTo); + ModelHome.send(mail); } private void setMailContents(List<Content> alternatives) {