This commit is contained in:
tidusjar 2016-05-26 09:01:47 +01:00
commit 573ad84fd8

View file

@ -62,7 +62,10 @@ namespace PlexRequests.Services.Notification
var emailSettings = (EmailNotificationSettings)settings; var emailSettings = (EmailNotificationSettings)settings;
if (!ValidateConfiguration(emailSettings)) return; if (!ValidateConfiguration(emailSettings))
{
return;
}
switch (model.NotificationType) switch (model.NotificationType)
{ {
@ -95,14 +98,18 @@ namespace PlexRequests.Services.Notification
} }
private bool ValidateConfiguration(EmailNotificationSettings settings) private bool ValidateConfiguration(EmailNotificationSettings settings)
{
if (string.IsNullOrEmpty(settings.EmailHost) || string.IsNullOrEmpty(settings.EmailUsername) || string.IsNullOrEmpty(settings.EmailPassword) || string.IsNullOrEmpty(settings.RecipientEmail) || string.IsNullOrEmpty(settings.EmailPort.ToString()))
{
return false;
}
if (!settings.EnableUserEmailNotifications)
{ {
if (!settings.Enabled) if (!settings.Enabled)
{ {
return false; return false;
} }
if (string.IsNullOrEmpty(settings.EmailHost) || string.IsNullOrEmpty(settings.EmailUsername) || string.IsNullOrEmpty(settings.EmailPassword) || string.IsNullOrEmpty(settings.RecipientEmail) || string.IsNullOrEmpty(settings.EmailPort.ToString()))
{
return false;
} }
return true; return true;