Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing some unnecessary values from SMTP entity #5113

Merged
merged 1 commit into from
Jun 21, 2022
Merged

Removing some unnecessary values from SMTP entity #5113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/ServerSettingsSmtpHostController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public HttpResponseMessage GetSmtpSettings()
smtpAuthentication = HostController.Instance.GetString("SMTPAuthentication"),
enableSmtpSsl = HostController.Instance.GetBoolean("SMTPEnableSSL", false),
smtpUserName = HostController.Instance.GetString("SMTPUsername"),
smtpPassword = GetSmtpPassword(),
smtpPassword = string.Empty,
smtpHostEmail = HostController.Instance.GetString("HostEmail"),
messageSchedulerBatchSize = Host.MessageSchedulerBatchSize,
},
Expand Down Expand Up @@ -80,7 +80,12 @@ public HttpResponseMessage UpdateSmtpSettings(UpdateSmtpSettingsRequest request)
try
{
var portalId = PortalSettings.Current.PortalId;
PortalController.UpdatePortalSetting(portalId, "SMTPmode", request.SmtpServerMode, false);
PortalController.UpdatePortalSetting(portalId, "SMTPmode", request.SmtpServerMode, false);

if (string.IsNullOrWhiteSpace(request.SmtpPassword))
{
request.SmtpPassword = GetSmtpPassword();
}

if (request.SmtpServerMode == "h")
{
Expand Down
2 changes: 1 addition & 1 deletion ...ce/Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Servers/App_LocalResources/Servers.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@
<value>SMTP Server Mode:</value>
</data>
<data name="plSMTPPassword.Help" xml:space="preserve">
<value>Enter the password for the SMTP server.</value>
<value>Enter the password for the SMTP server. Leave blank to not to change it.</value>
</data>
<data name="plSMTPPassword.Text" xml:space="preserve">
<value>SMTP Password:</value>
Expand Down