Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed issue #648 - Sending emails via SMTPS (Port 465 and SSL) not possible.

Browse source
This commit is contained in:
Martin Edenhofer 2017-01-19 06:03:19 +01:00
parent 9a8327c51a
commit 24d8b79503
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/channel/driver/smtp.rb
View file

@ -30,7 +30,11 @@ class Channel::Driver::Smtp
if !options.key?(:port) || options[:port].empty? if !options.key?(:port) || options[:port].empty?
options[:port] = 25 options[:port] = 25
end end
if !options.key?(:ssl)
if options[:port].to_i == 465
options[:ssl] = true
end
end
if !options.key?(:domain) if !options.key?(:domain)
# set fqdn, if local fqdn - use domain of sender # set fqdn, if local fqdn - use domain of sender
fqdn = Setting.get('fqdn') fqdn = Setting.get('fqdn')
@ -57,6 +61,11 @@ class Channel::Driver::Smtp
enable_starttls_auto: options[:enable_starttls_auto], enable_starttls_auto: options[:enable_starttls_auto],
} }
# set ssl if needed
if options[:ssl].present?
smtp_params[:ssl] = options[:ssl]
end
# add authentication only if needed # add authentication only if needed
if options[:user].present? if options[:user].present?
smtp_params[:user_name] = options[:user] smtp_params[:user_name] = options[:user]