Diplomarbeit-Absolventenverein/oqtane.framework
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #5930 - NotificationJob not sending emails (reverting #5848)

Browse Source
This commit is contained in:
sbwalker
2025-12-30 08:33:28 -05:00
parent b4c6b6b794
commit ef20d870ee
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Oqtane.Server/Infrastructure/Jobs/NotificationJob.cs
View File

@@ -160,7 +160,7 @@ namespace Oqtane.Infrastructure
var toEmail = notification.ToEmail ?? ""; var toEmail = notification.ToEmail ?? "";
var toName = notification.ToDisplayName ?? ""; var toName = notification.ToDisplayName ?? "";
// get sender and receiver information from user information if available // get sender from user information if "from" email or name not specified and user id is available
if ((string.IsNullOrEmpty(fromEmail) || string.IsNullOrEmpty(fromName)) && notification.FromUserId != null) if ((string.IsNullOrEmpty(fromEmail) || string.IsNullOrEmpty(fromName)) && notification.FromUserId != null)
{ {
var user = userRepository.GetUser(notification.FromUserId.Value); var user = userRepository.GetUser(notification.FromUserId.Value);
@@ -170,6 +170,7 @@ namespace Oqtane.Infrastructure
fromName = string.IsNullOrEmpty(fromName) ? user.DisplayName ?? "" : fromName; fromName = string.IsNullOrEmpty(fromName) ? user.DisplayName ?? "" : fromName;
} }
} }
// get recipient from user information if "to" email or name not specified and user id is available
if ((string.IsNullOrEmpty(toEmail) || string.IsNullOrEmpty(toName)) && notification.ToUserId != null) if ((string.IsNullOrEmpty(toEmail) || string.IsNullOrEmpty(toName)) && notification.ToUserId != null)
{ {
var user = userRepository.GetUser(notification.ToUserId.Value); var user = userRepository.GetUser(notification.ToUserId.Value);
@@ -185,26 +186,25 @@ namespace Oqtane.Infrastructure
MailboxAddress from = null; MailboxAddress from = null;
var mailboxAddressValidationError = ""; var mailboxAddressValidationError = "";
// sender // SMTP Sender should always be used if site is not using an Open Relay or if the "from" email address is not specified (ie. system messages)
if ((settingRepository.GetSettingValue(settings, "SMTPRelay", "False") == "True") && string.IsNullOrEmpty(fromEmail)) if (settingRepository.GetSettingValue(settings, "SMTPRelay", "False") != "True" || string.IsNullOrEmpty(fromEmail))
{ {
fromEmail = settingRepository.GetSettingValue(settings, "SMTPSender", ""); fromEmail = settingRepository.GetSettingValue(settings, "SMTPSender", "");
fromName = string.IsNullOrEmpty(fromName) ? site.Name : fromName; fromName = string.IsNullOrEmpty(fromName) ? site.Name : fromName;
} }
if (MailboxAddress.TryParse(fromEmail, out from)) if (MailboxAddress.TryParse(fromEmail, out from))
{ {
from.Name = fromName; from.Name = fromName; //override with "from" name set previously
} }
else else
{ {
mailboxAddressValidationError += $" Invalid Sender: {fromName} <{fromEmail}>"; mailboxAddressValidationError += $" Invalid Sender: {fromName} <{fromEmail}>";
} }
// recipient // recipient
if (MailboxAddress.TryParse(toEmail, out to)) if (MailboxAddress.TryParse(toEmail, out to))
{ {
to.Name = toName; to.Name = toName; //override with "to" name set previously
} }
else else
{ {