From e499e1ba85717da2c05e9da1dd08cfea81a77ddd Mon Sep 17 00:00:00 2001 From: Thomas Piccirello Date: Sun, 21 Oct 2018 23:14:39 -0400 Subject: [PATCH] Add email "From" option --- src/webui/api/appcontroller.cpp | 3 +++ src/webui/www/private/preferences_content.html | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/src/webui/api/appcontroller.cpp b/src/webui/api/appcontroller.cpp index cc170904b..cfe75a449 100644 --- a/src/webui/api/appcontroller.cpp +++ b/src/webui/api/appcontroller.cpp @@ -113,6 +113,7 @@ void AppController::preferencesAction() data["scan_dirs"] = nativeDirs; // Email notification upon download completion data["mail_notification_enabled"] = pref->isMailNotificationEnabled(); + data["mail_notification_sender"] = pref->getMailNotificationSender(); data["mail_notification_email"] = pref->getMailNotificationEmail(); data["mail_notification_smtp"] = pref->getMailNotificationSMTP(); data["mail_notification_ssl_enabled"] = pref->getMailNotificationSMTPSSL(); @@ -324,6 +325,8 @@ void AppController::setPreferencesAction() // Email notification upon download completion if (m.contains("mail_notification_enabled")) pref->setMailNotificationEnabled(m["mail_notification_enabled"].toBool()); + if ((it = m.find(QLatin1String("mail_notification_sender"))) != m.constEnd()) + pref->setMailNotificationSender(it.value().toString()); if (m.contains("mail_notification_email")) pref->setMailNotificationEmail(m["mail_notification_email"].toString()); if (m.contains("mail_notification_smtp")) diff --git a/src/webui/www/private/preferences_content.html b/src/webui/www/private/preferences_content.html index a24fefc75..32d469cea 100644 --- a/src/webui/www/private/preferences_content.html +++ b/src/webui/www/private/preferences_content.html @@ -148,6 +148,14 @@ + + + +
+ + + +
@@ -858,6 +866,7 @@ updateMailNotification = function() { var isMailNotificationEnabled = $('mail_notification_checkbox').getProperty('checked'); + $('src_email_txt').setProperty('disabled', !isMailNotificationEnabled); $('dest_email_txt').setProperty('disabled', !isMailNotificationEnabled); $('smtp_server_txt').setProperty('disabled', !isMailNotificationEnabled); $('mail_ssl_checkbox').setProperty('disabled', !isMailNotificationEnabled); @@ -1093,6 +1102,7 @@ // Email notification upon download completion $('mail_notification_checkbox').setProperty('checked', pref.mail_notification_enabled); + $('src_email_txt').setProperty('value', pref.mail_notification_sender); $('dest_email_txt').setProperty('value', pref.mail_notification_email); $('smtp_server_txt').setProperty('value', pref.mail_notification_smtp); $('mail_ssl_checkbox').setProperty('checked', pref.mail_notification_ssl_enabled); @@ -1323,6 +1333,7 @@ // Email notification upon download completion settings.set('mail_notification_enabled', $('mail_notification_checkbox').getProperty('checked')); + settings.set('mail_notification_sender', $('src_email_txt').getProperty('value')); settings.set('mail_notification_email', $('dest_email_txt').getProperty('value')); settings.set('mail_notification_smtp', $('smtp_server_txt').getProperty('value')); settings.set('mail_notification_ssl_enabled', $('mail_ssl_checkbox').getProperty('checked'));