diff options
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | app/controllers/action_mailbox/inbound_emails_controller.rb (renamed from app/controllers/action_mailroom/inbound_emails_controller.rb) | 4 | ||||
-rw-r--r-- | app/controllers/rails/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb) | 8 | ||||
-rw-r--r-- | app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb (renamed from app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb) | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/.DS_Store b/app/controllers/.DS_Store Binary files differnew file mode 100644 index 0000000000..ea1205963a --- /dev/null +++ b/app/controllers/.DS_Store diff --git a/app/controllers/action_mailroom/inbound_emails_controller.rb b/app/controllers/action_mailbox/inbound_emails_controller.rb index 57e0530ac6..ec9bd6f229 100644 --- a/app/controllers/action_mailroom/inbound_emails_controller.rb +++ b/app/controllers/action_mailbox/inbound_emails_controller.rb @@ -1,12 +1,12 @@ # TODO: Add access protection using basic auth with verified tokens. Maybe coming from credentials by default? # TODO: Spam/malware catching? # TODO: Specific bounces for SMTP good citizenship: 200/404/400 -class ActionMailroom::InboundEmailsController < ActionController::Base +class ActionMailbox::InboundEmailsController < ActionController::Base skip_forgery_protection before_action :require_rfc822_message, only: :create def create - ActionMailroom::InboundEmail.create_and_extract_message_id!(params[:message]) + ActionMailbox::InboundEmail.create_and_extract_message_id!(params[:message]) head :created end diff --git a/app/controllers/rails/.DS_Store b/app/controllers/rails/.DS_Store Binary files differnew file mode 100644 index 0000000000..627263b12d --- /dev/null +++ b/app/controllers/rails/.DS_Store diff --git a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index a5a1f34929..70537da9c4 100644 --- a/app/controllers/rails/conductor/action_mailroom/inbound_emails_controller.rb +++ b/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -1,13 +1,13 @@ -class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conductor::BaseController +class Rails::Conductor::ActionMailbox::InboundEmailsController < Rails::Conductor::BaseController def index - @inbound_emails = ActionMailroom::InboundEmail.order(created_at: :desc) + @inbound_emails = ActionMailbox::InboundEmail.order(created_at: :desc) end def new end def show - @inbound_email = ActionMailroom::InboundEmail.find(params[:id]) + @inbound_email = ActionMailbox::InboundEmail.find(params[:id]) end def create @@ -21,7 +21,7 @@ class Rails::Conductor::ActionMailroom::InboundEmailsController < Rails::Conduct end def create_inbound_email(mail) - ActionMailroom::InboundEmail.create! raw_email: \ + ActionMailbox::InboundEmail.create! raw_email: \ { io: StringIO.new(mail.to_s), filename: 'inbound.eml', content_type: 'message/rfc822', identify: false } end end diff --git a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb index 028ed9e2d6..226116a3d6 100644 --- a/app/controllers/rails/conductor/action_mailroom/reroutes_controller.rb +++ b/app/controllers/rails/conductor/action_mailbox/reroutes_controller.rb @@ -1,6 +1,6 @@ -class Rails::Conductor::ActionMailroom::ReroutesController < Rails::Conductor::BaseController +class Rails::Conductor::ActionMailbox::ReroutesController < Rails::Conductor::BaseController def create - inbound_email = ActionMailroom::InboundEmail.find(params[:inbound_email_id]) + inbound_email = ActionMailbox::InboundEmail.find(params[:inbound_email_id]) reroute inbound_email redirect_to main_app.rails_conductor_inbound_email_url(inbound_email) |