| <%- @T('Host') %>
| <%= channel.options.inbound.options.host %>
diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
index e64be0c33..4d575ffab 100644
--- a/app/controllers/channels_controller.rb
+++ b/app/controllers/channels_controller.rb
@@ -149,6 +149,7 @@ curl http://localhost/api/v1/channels.json -v -u #{login}:#{password} -H "Conten
result = EmailHelper::Probe.full(
email: params[:email],
password: params[:password],
+ folder: params[:folder],
)
# verify if user+host already exists
diff --git a/app/models/channel/driver/imap.rb b/app/models/channel/driver/imap.rb
index 644222336..65324f27b 100644
--- a/app/models/channel/driver/imap.rb
+++ b/app/models/channel/driver/imap.rb
@@ -65,7 +65,7 @@ returns
end
Timeout.timeout(timeout) do
- @imap = Net::IMAP.new( options[:host], port, ssl, nil, false )
+ @imap = Net::IMAP.new(options[:host], port, ssl, nil, false)
end
# try LOGIN, if not - try plain
@@ -90,7 +90,7 @@ returns
# check mode only
if check_type == 'check'
Rails.logger.info 'check only mode, fetch no emails'
- content_max_check = 5
+ content_max_check = 2
content_messages = 0
# check messages
diff --git a/app/models/channel/driver/pop3.rb b/app/models/channel/driver/pop3.rb
index ac64365fa..ff50e2998 100644
--- a/app/models/channel/driver/pop3.rb
+++ b/app/models/channel/driver/pop3.rb
@@ -54,7 +54,7 @@ returns
Rails.logger.info "fetching pop3 (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl})"
- @pop = Net::POP3.new( options[:host], port )
+ @pop = Net::POP3.new(options[:host], port)
#@pop.set_debug_output $stderr
# on check, reduce open_timeout to have faster probing
diff --git a/lib/email_helper/probe.rb b/lib/email_helper/probe.rb
index 00da2856a..23e4bf711 100644
--- a/lib/email_helper/probe.rb
+++ b/lib/email_helper/probe.rb
@@ -8,6 +8,7 @@ get result of probe
result = EmailHelper::Probe.full(
email: 'znuny@example.com',
password: 'somepassword',
+ folder: 'some_folder', # optional im imap
)
returns on success
@@ -23,7 +24,8 @@ returns on success
ssl: true,
user: 'some@example.com',
password: 'password',
- },
+ folder: 'some_folder', # optional im imap
+ },
},
outbound: {
adapter: 'smtp',
@@ -71,6 +73,11 @@ returns on fail
next if domain_to_check !~ /#{settings[:domain]}/i
+ # add folder to config if needed
+ if !params[:folder].empty? && settings[:inbound] && settings[:inbound][:options]
+ settings[:inbound][:options][:folder] = params[:folder]
+ end
+
# probe inbound
Rails.logger.debug "INBOUND PROBE PROVIDER: #{settings[:inbound].inspect}"
result_inbound = EmailHelper::Probe.inbound(settings[:inbound])
@@ -103,6 +110,12 @@ returns on fail
}
success = false
inbound_map.each {|config|
+
+ # add folder to config if needed
+ if !params[:folder].empty? && config[:options]
+ config[:options][:folder] = params[:folder]
+ end
+
Rails.logger.debug "INBOUND PROBE GUESS: #{config.inspect}"
result_inbound = EmailHelper::Probe.inbound(config)
Rails.logger.debug "INBOUND RESULT GUESS: #{result_inbound.inspect}"
@@ -165,6 +178,7 @@ get result of inbound probe
ssl: true,
user: 'some@example.com',
password: 'password',
+ folder: 'some_folder', # optional
}
)
@@ -184,6 +198,7 @@ returns on fail
ssl: true,
user: 'some@example.com',
password: 'password',
+ folder: 'some_folder', # optional im imap
},
message: 'error message from used lib',
message_human: 'translated error message, readable for humans',
@@ -365,6 +380,8 @@ returns on fail
'No route to host' => { host: true },
'execution expired' => { host: true },
'Connection refused' => { host: true },
+ 'Mailbox doesn\'t exist' => { folder: true },
+ 'Folder doesn\'t exist' => { folder: true },
}
end
|