Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.

Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.

vendor/plugins/exception_notification/init.rb

@@ -1 +1,4 @@
 require "action_mailer"
+require "exception_notifier"
+require "exception_notifiable"
+require "exception_notifier_helper"

vendor/plugins/exception_notification/lib/exception_notifier.rb

@@ -33,25 +33,25 @@ class ExceptionNotifier < ActionMailer::Base
   @@sections = %w(request session environment backtrace)
   cattr_accessor :sections
 
-  def self.reloadable?; false; end
+  self.template_root = "#{File.dirname(__FILE__)}/../views"
+
+  def self.reloadable?() false end
 
   def exception_notification(exception, controller, request, data={})
+    content_type "text/plain"
+
     subject    "#{email_prefix}#{controller.controller_name}##{controller.action_name} (#{exception.class}) #{exception.message.inspect}"
 
     recipients exception_recipients
     from       sender_address
 
     body       data.merge({ :controller => controller, :request => request,
-                  :exception => exception, :host => request.env["HTTP_HOST"],
+                  :exception => exception, :host => (request.env["HTTP_X_FORWARDED_HOST"] || request.env["HTTP_HOST"]),
                   :backtrace => sanitize_backtrace(exception.backtrace),
                   :rails_root => rails_root, :data => data,
                   :sections => sections })
   end
 
-  def template_root
-    "#{File.dirname(__FILE__)}/../views"
-  end
-
   private
 
     def sanitize_backtrace(trace)
@@ -60,8 +60,7 @@ class ExceptionNotifier < ActionMailer::Base
     end
 
     def rails_root
-      return @rails_root if @rails_root
-      @rails_root = Pathname.new(RAILS_ROOT).cleanpath.to_s
+      @rails_root ||= Pathname.new(RAILS_ROOT).cleanpath.to_s
     end
 
 end

vendor/plugins/exception_notification/lib/exception_notifier_helper.rb

@@ -67,11 +67,12 @@ module ExceptionNotifierHelper
   end
   
   def filter_sensitive_post_data_parameters(parameters)
-    exclude_raw_post_parameters? ? @controller.filter_parameters(parameters) : parameters
+    exclude_raw_post_parameters? ? @controller.__send__(:filter_parameters, parameters) : parameters
   end
   
   def filter_sensitive_post_data_from_env(env_key, env_value)
     return env_value unless exclude_raw_post_parameters?
-    (env_key =~ /RAW_POST_DATA/i) ? PARAM_FILTER_REPLACEMENT : env_value
+    return PARAM_FILTER_REPLACEMENT if (env_key =~ /RAW_POST_DATA/i)
+    return @controller.__send__(:filter_parameters, {env_key => env_value}).values[0]
   end
 end

vendor/plugins/exception_notification/views/exception_notifier/_environment.rhtml

@@ -1,6 +1,6 @@
 <% max = @request.env.keys.max { |a,b| a.length <=> b.length } -%>
 <% @request.env.keys.sort.each do |key| -%>
-* <%= "%*-s: %s" % [max.length, key, filter_sensitive_post_data_from_env(key, @request.env[key].to_s.strip)] %>
+* <%= "%-*s: %s" % [max.length, key, filter_sensitive_post_data_from_env(key, @request.env[key].to_s.strip)] %>
 <% end -%>
 
 * Process: <%= $$ %>

vendor/plugins/exception_notification/views/exception_notifier/_request.rhtml

@@ -1,3 +1,4 @@
-* URL: <%= @request.protocol %><%= @host %><%= @request.request_uri %>
+* URL       : <%= @request.protocol %><%= @host %><%= @request.request_uri %>
+* IP address: <%= @request.env["HTTP_X_FORWARDED_FOR"] || @request.env["REMOTE_ADDR"] %>
 * Parameters: <%= filter_sensitive_post_data_parameters(@request.parameters).inspect %>
 * Rails root: <%= @rails_root %>