1 files changed, 3 insertions, 1 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm
index 66dc20a3a..f9762662c 100644
--- a/perllib/FixMyStreet/App/Controller/Report/New.pm
+++ b/perllib/FixMyStreet/App/Controller/Report/New.pm
@@ -655,8 +655,10 @@ sub setup_categories_and_bodies : Private {
                 $category_extras{ $contact->category } = $metas
                     if scalar @$metas;
 
+                my $body_send_method = $bodies{$contact->body_id}->send_method || '';
                 $c->stash->{unresponsive}{$contact->category} = $contact->body_id
-                    if $contact->email =~ /^REFUSED$/i;
+                    if !$c->stash->{unresponsive}{ALL} &&
+                        ($contact->email =~ /^REFUSED$/i || $body_send_method eq 'Refused');
 
                 $non_public_categories{ $contact->category } = 1 if $contact->non_public;
             }

path: root/vendor/plugins/exception_notification/lib/exception_notification/notifier.rb

require 'pathname'

# Copyright (c) 2005 Jamis Buck
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sublicense, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice shall be
# included in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
class ExceptionNotification::Notifier < ActionMailer::Base
  self.mailer_name = 'exception_notifier'
  self.view_paths << "#{File.dirname(__FILE__)}/../../views"
  
  # next line is a hack to fix
  # undefined method `find_template' for #<Array:0x000001009cd230>
  # after Rails 2.3.8 -> 2.3.11 upgrade
  self.view_paths = ActionView::PathSet.new(self.view_paths) unless self.view_paths.respond_to?(:find_template)
  
  @@sender_address = %("Exception Notifier" <exception.notifier@default.com>)
  cattr_accessor :sender_address

  @@exception_recipients = []
  cattr_accessor :exception_recipients

  @@email_prefix = "[ERROR] "
  cattr_accessor :email_prefix

  @@sections = %w(request session environment backtrace)
  cattr_accessor :sections

  def self.reloadable?() false end

  def exception_notification(exception, controller, request, data={})
    source = self.class.exception_source(controller)
    content_type "text/plain"

    subject    "#{email_prefix}#{source} (#{exception.class}) #{exception.message.inspect}"

    recipients exception_recipients
    from       sender_address

    body       data.merge({ :controller => controller, :request => request,
                  :exception => exception, :exception_source => source, :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 self.exception_source(controller)
    if controller.respond_to?(:controller_name)
      "in #{controller.controller_name}##{controller.action_name}"
    else
      "outside of a controller"
    end
  end

private

  def sanitize_backtrace(trace)
    re = Regexp.new(/^#{Regexp.escape(rails_root)}/)
    trace.map { |line| Pathname.new(line.gsub(re, "[RAILS_ROOT]")).cleanpath.to_s }
  end

  def rails_root
    @rails_root ||= Pathname.new(RAILS_ROOT).cleanpath.to_s
  end
end