diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2f29dec..8b67799 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -215,12 +215,10 @@ class ApplicationController < BaseController def contact_send email_list = ['Godwin '] - if params[:reason] == 'conference' + if params[:reason] == 'conference' && logged_in? - @conference.organizations.each do |org| - org.users.each do |user| - # email_list << user.named_email - end + @conference.conference_administrators.each do |user| + email_list << user.named_email end end @@ -234,14 +232,14 @@ class ApplicationController < BaseController request_info['env'][key.to_s] = value.to_s end - send_mail(:contact, + send_delayed_mail(:contact, current_user || params[:email], params[:subject], params[:message], email_list ) - send_mail(:contact_details, + send_delayed_mail(:contact_details, current_user || params[:email], params[:subject], params[:message], @@ -326,7 +324,7 @@ class ApplicationController < BaseController object.get_translators(data, locale).each do |id, user| if user.id != current_user.id && user.id != translator_id LinguaFranca.with_locale user.locale do - send_mail(:send, mailer, object.id, data, locale, user.id, translator.id) + send_delayed_mail(:send, mailer, object.id, data, locale, user.id, translator.id) end end end @@ -340,7 +338,7 @@ class ApplicationController < BaseController object.get_translators(data).each do |id, user| if user.id != current_user.id LinguaFranca.with_locale user.locale do - send_mail(:send, mailer, object.id, data, user.id, current_user.id) + send_delayed_mail(:send, mailer, object.id, data, user.id, current_user.id) end end end @@ -614,7 +612,7 @@ class ApplicationController < BaseController send_mail(:email_confirmation, confirmation.id) end - def send_mail(*args) + def send_delayed_mail(*args) if Rails.env.preview? || Rails.env.production? UserMailer.delay(queue: Rails.env.to_s).send(*args) else @@ -622,6 +620,10 @@ class ApplicationController < BaseController end end + def send_mail(*args) + UserMailer.send(*args).deliver_now + end + def policies [ :commitment, diff --git a/app/controllers/conference_administration_controller.rb b/app/controllers/conference_administration_controller.rb index ac0d8a3..82d4529 100644 --- a/app/controllers/conference_administration_controller.rb +++ b/app/controllers/conference_administration_controller.rb @@ -1359,7 +1359,7 @@ class ConferenceAdministrationController < ApplicationController @register_template = :administration if params[:button] == 'send' view_context.broadcast_to(@send_to).each do |user| - send_mail(:broadcast, + send_delayed_mail(:broadcast, "#{request.protocol}#{request.host_with_port}", @subject, @body,