From 43c1833cd71fbe90b2e6281fedb1e847b7baee04 Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Thu, 17 Aug 2017 23:49:34 +0200
Subject: [PATCH] Set ActionMailer configuration in FoodsoftConfig

---
 app/mailers/mailer.rb                           | 17 -----------------
 lib/foodsoft_config.rb                          |  8 ++++++++
 plugins/messages/app/mailers/messages_mailer.rb |  1 -
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/app/mailers/mailer.rb b/app/mailers/mailer.rb
index 807f53b2..fada9cb9 100644
--- a/app/mailers/mailer.rb
+++ b/app/mailers/mailer.rb
@@ -16,7 +16,6 @@ class Mailer < ActionMailer::Base
   # Sends an email with instructions on how to reset the password.
   # Assumes user.setResetPasswordToken has been successfully called already.
   def reset_password(user)
-    set_foodcoop_scope
     @user = user
     @link = new_password_url(id: @user.id, token: @user.reset_password_token)
 
@@ -26,7 +25,6 @@ class Mailer < ActionMailer::Base
     
   # Sends an invite email.
   def invite(invite)
-    set_foodcoop_scope
     @invite = invite
     @link = accept_invitation_url(token: @invite.token)
 
@@ -36,7 +34,6 @@ class Mailer < ActionMailer::Base
 
   # Notify user of upcoming task.
   def upcoming_tasks(user, task)
-    set_foodcoop_scope
     @user = user
     @task = task
 
@@ -46,7 +43,6 @@ class Mailer < ActionMailer::Base
 
   # Sends order result for specific Ordergroup
   def order_result(user, group_order)
-    set_foodcoop_scope
     @order        = group_order.order
     @group_order  = group_order
 
@@ -56,7 +52,6 @@ class Mailer < ActionMailer::Base
 
   # Notify user if account balance is less than zero
   def negative_balance(user,transaction)
-    set_foodcoop_scope
     @group        = user.ordergroup
     @transaction  = transaction
 
@@ -65,7 +60,6 @@ class Mailer < ActionMailer::Base
   end
 
   def feedback(user, feedback)
-    set_foodcoop_scope
     @user = user
     @feedback = feedback
 
@@ -77,7 +71,6 @@ class Mailer < ActionMailer::Base
   end
 
   def not_enough_users_assigned(task, user)
-    set_foodcoop_scope
     @task = task
     @user = user
 
@@ -85,14 +78,4 @@ class Mailer < ActionMailer::Base
          :subject => "[#{FoodsoftConfig[:name]}] " + I18n.t('mailer.not_enough_users_assigned.subject', :task => task.name)
   end
 
-  private
-
-  # @todo this global stuff gives threading problems when foodcoops have different values! - pass args to `url_for` instead
-  def set_foodcoop_scope(foodcoop = FoodsoftConfig.scope)
-    [:protocol, :host, :port, :script_name].each do |k|
-      ActionMailer::Base.default_url_options[k] = FoodsoftConfig[k] if FoodsoftConfig[k]
-    end
-    ActionMailer::Base.default_url_options[:foodcoop] = foodcoop
-  end
-  
 end
diff --git a/lib/foodsoft_config.rb b/lib/foodsoft_config.rb
index d6b127e4..688872ce 100644
--- a/lib/foodsoft_config.rb
+++ b/lib/foodsoft_config.rb
@@ -78,6 +78,7 @@ class FoodsoftConfig
     def select_foodcoop(foodcoop)
       set_config foodcoop
       setup_database
+      setup_mailing
     end
 
     def select_default_foodcoop
@@ -220,6 +221,13 @@ class FoodsoftConfig
       ActiveRecord::Base.establish_connection(database_config)
     end
 
+    def setup_mailing
+      [:protocol, :host, :port, :script_name].each do |k|
+        ActionMailer::Base.default_url_options[k] = self[k] if self[k]
+      end
+      ActionMailer::Base.default_url_options[:foodcoop] = scope
+    end
+
     # Completes foodcoop configuration with program defaults.
     # @see #foodsoft_config
     def set_missing
diff --git a/plugins/messages/app/mailers/messages_mailer.rb b/plugins/messages/app/mailers/messages_mailer.rb
index 85695050..77a7a4f6 100644
--- a/plugins/messages/app/mailers/messages_mailer.rb
+++ b/plugins/messages/app/mailers/messages_mailer.rb
@@ -1,7 +1,6 @@
 class MessagesMailer < Mailer
   # Sends an email copy of the given internal foodsoft message.
   def foodsoft_message(message, recipient)
-    set_foodcoop_scope
     @message = message
 
     reply_email_domain = FoodsoftConfig[:reply_email_domain]