Removed unnecessary config params. Improved error handling.

app/controllers/application_controller.rb

@@ -140,10 +140,15 @@ class ApplicationController < ActionController::Base
   def select_foodcoop
     if Foodsoft.config[:multi_coop_install]
       if !params[:foodcoop].blank?
-        # Set Config
+        begin
-        Foodsoft.env = params[:foodcoop]
+          # Set Config
-        # Set database-connection
+          Foodsoft.env = params[:foodcoop]
-        ActiveRecord::Base.establish_connection(Foodsoft.database)
+          # Set database-connection
+          ActiveRecord::Base.establish_connection(Foodsoft.database)
+        rescue => error
+          flash[:error] = error.to_s
+          redirect_to root_path
+        end
       else
         redirect_to root_path
       end

app/views/layouts/email.html.erb

@@ -1,6 +1,6 @@
 <%= yield %>
 
 --
-FoodSoft: <%= @foodsoftUrl %>
+FoodSoft: <%= url_for(:controller => "home", :action => "index", :only_path => false) %>
-Foodcoop-Homepage: <%= Foodsoft.config[:base_url] %>
+Foodcoop-Homepage: <%= Foodsoft.config[:homepage] %>
 Hilfe/Help: <%= Foodsoft.config[:help_url] %>

config/app_config.yml.SAMPLE

@@ -22,9 +22,6 @@ development: &defaults
     email: foodsoft@myfoodcoop.org
     phone: "030 323 23249"
 
-  # base URL for this installation
-  base_url: http://foodsoft.fctest.de
-
   # Homepage
   homepage: http://www.fctest.de
 

config/initializers/load_app_config.rb

@@ -18,11 +18,12 @@ end
 Foodsoft.env = RAILS_ENV
 
 # Set action mailer default host for url generating
-ActionMailer::Base.default_url_options = { 
+url_options = {
-  :host => Foodsoft.config[:host],
+    :host => Foodsoft.config[:host],
-  :port => Foodsoft.config[:port],
+    :protocol => Foodsoft.config[:protocol]
-  :protocol => Foodsoft.config[:protocol]
 }
+url_options.merge!({:port => Foodsoft.config[:port]}) if Foodsoft.config[:port]
+ActionMailer::Base.default_url_options = url_options
 
 # Configuration of the exception_notification plugin
 # Mailadresses are set in config/foodsoft.yaml