IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FEATURE: support disabling emails for non-staff users

Browse Source
This commit is contained in:
Arpit Jalan
2018-06-07 09:44:35 +05:30
parent d556975cdc
commit f9ab3848ed
15 changed files with 69 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/email/sender.rb
View File

@@ -22,7 +22,7 @@ module Email
end
def send
return if SiteSetting.disable_emails && @email_type.to_s != "admin_login"
return if SiteSetting.disable_emails == "yes" && @email_type.to_s != "admin_login"
return if ActionMailer::Base::NullMail === @message
return if ActionMailer::Base::NullMail === (@message.message rescue nil)
@@ -30,6 +30,11 @@ module Email
return skip(I18n.t('email_log.message_blank')) if @message.blank?
return skip(I18n.t('email_log.message_to_blank')) if @message.to.blank?
if SiteSetting.disable_emails == "non-staff"
user = User.find_by_email(to_address)
return unless user && user.staff?
end
if @message.text_part
return skip(I18n.t('email_log.text_part_body_blank')) if @message.text_part.body.to_s.blank?
else