github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 20:20:43 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

smtp_should_reject API: use better approach to find user email.

Browse Source
This commit is contained in:
Ryan C. Gordon 2017-04-05 12:46:56 -04:00
parent a51c191a66
commit c51af13338
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/email_controller.rb
View File

@ -73,7 +73,7 @@ class Admin::EmailController < Admin::AdminController
params.require(:from) params.require(:from)
params.require(:to) params.require(:to)
# These strings aren't localized; they are sent to an anonymous SMTP user. # These strings aren't localized; they are sent to an anonymous SMTP user.
if User.find_by_email(params[:from]).nil? && !SiteSetting.enable_staged_users if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users
render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" }
elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil? elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil?
render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" }