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

Fixed #37 - added port options.

Browse source
This commit is contained in:
Martin Edenhofer 2013-01-04 23:30:57 +01:00
parent 8da10083ac
commit ae20f34944
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_channel/email.js.coffee
View file

@ -490,7 +490,8 @@ class App.ChannelEmailOutbound extends App.Controller
{ name: 'host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['host']) }, { name: 'host', display: 'Host', tag: 'input', type: 'text', limit: 120, null: false, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['host']) },
{ name: 'user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['user']) }, { name: 'user', display: 'User', tag: 'input', type: 'text', limit: 120, null: true, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['user']) },
{ name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['password']) }, { name: 'password', display: 'Password', tag: 'input', type: 'password', limit: 120, null: true, class: 'span4', autocapitalize: false, default: (channel_used['options']&&channel_used['options']['password']) },
{ name: 'ssl', display: 'SSL', tag: 'select', multiple: false, null: false, options: { true: 'yes', false: 'no' } , class: 'span4', default: (channel_used['options']&&channel_used['options']['ssl']) }, { name: 'ssl', display: 'SSL', tag: 'select', multiple: false, null: false, options: { true: 'yes', false: 'no' } , class: 'span4', translate: true, default: (channel_used['options']&&channel_used['options']['ssl']) },
{ name: 'port', display: 'Port', tag: 'input', type: 'text', limit: 5, null: false, class: 'span1', autocapitalize: false, default: ((channel_used['options']&&channel_used['options']['port']) || 25) },
] ]
@form = new App.ControllerForm( @form = new App.ControllerForm(
el: @el.find('#form-email-adapter-settings'), el: @el.find('#form-email-adapter-settings'),
@ -525,6 +526,7 @@ class App.ChannelEmailOutbound extends App.Controller
user: params['user'], user: params['user'],
password: params['password'], password: params['password'],
ssl: params['ssl'], ssl: params['ssl'],
port: params['port'],
}, },
active: true, active: true,
) )

3
app/models/channel/smtp.rb
View file

@ -9,8 +9,7 @@ class Channel::SMTP < Channel::EmailBuild
mail.delivery_method :smtp, { mail.delivery_method :smtp, {
:openssl_verify_mode => 'none', :openssl_verify_mode => 'none',
:address => channel[:options][:host], :address => channel[:options][:host],
# :port => 587, :port => channel[:options][:port] || 25,
:port => 25,
:domain => channel[:options][:host], :domain => channel[:options][:host],
:user_name => channel[:options][:user], :user_name => channel[:options][:user],
:password => channel[:options][:password], :password => channel[:options][:password],