Hacktoberfest: trim fields to match mailer #221
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Trim fields to match similar changes that were made to mailer. Also matched descriptions to match mailer. Finally, I added the same form validator to defaultSuffix that exists in mailer. Signed-off-by: Darin Pope <darin@planetpope.com>
ghost
reviewed
Oct 18, 2020
| @@ -453,6 +454,13 @@ public void setDefaultContentType(String contentType) { | |||
| } | |||
| } | |||
|
|
|||
| public FormValidation doCheckDefaultSuffix(@QueryParameter String value) { | |||
| if (value.matches("@[A-Za-z0-9.\\-]+") || Util.fixEmptyAndTrim(value)==null) | |||
There was a problem hiding this comment.
Are underscores not allowed in the suffix?
There was a problem hiding this comment.
according to RFC 1035 (...have as interior characters only letters, digits, and hyphen), underscores are not allowed.
This method was copied from mailer-plugin, so if it should be allowed, it probably should be done in both here and in mailer.
There was a problem hiding this comment.
Thank you for the clarification. The PR looks great to me!
ghost
approved these changes
Oct 18, 2020
slide
reviewed
Oct 19, 2020
| address = nullify(jo.optString("address", null)); | ||
| smtpHost = nullify(jo.optString("smtpHost", null)); | ||
| smtpPort = nullify(jo.optString("smtpPort", null)); | ||
| address = Util.nullify(jo.optString("address", null)); |
There was a problem hiding this comment.
This constructor is no longer used, it is there only for binary compatibility.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trim fields to match similar changes that were made to mailer.
Also matched descriptions to match mailer.
Finally, I added the same form validator to defaultSuffix that exists in mailer.
Signed-off-by: Darin Pope darin@planetpope.com