diff options
| -rw-r--r-- | app/controllers/request_controller.rb | 4 | ||||
| -rw-r--r-- | app/models/info_request.rb | 6 | ||||
| -rw-r--r-- | app/views/admin_request/edit.rhtml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 3a66af95c..dd12a91b5 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -4,7 +4,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: request_controller.rb,v 1.104 2008-09-02 17:44:14 francis Exp $ +# $Id: request_controller.rb,v 1.105 2008-09-02 17:59:39 francis Exp $ class RequestController < ApplicationController @@ -379,7 +379,7 @@ class RequestController < ApplicationController end mail = RequestMailer.create_fake_response(@info_request, @user, body, file_name, file_content) - @info_request.receive(mail, mail.encoded) + @info_request.receive(mail, mail.encoded, true) flash[:notice] = "Thank you for responding to this FOI request! Your response has been published below, and a link to your response has been emailed to " + CGI.escapeHTML(@info_request.user.name) + "." redirect_to request_url(@info_request) return diff --git a/app/models/info_request.rb b/app/models/info_request.rb index f32a7b3e7..28d82e989 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.135 2008-08-31 23:43:53 francis Exp $ +# $Id: info_request.rb,v 1.136 2008-09-02 17:59:40 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -237,9 +237,9 @@ public end # A new incoming email to this request - def receive(email, raw_email) + def receive(email, raw_email, override_stop_new_responses = false) # See if new responses are prevented for spam reasons - if self.stop_new_responses + if self.stop_new_responses && !override_stop_new_responses RequestMailer.deliver_stopped_responses(self, email) return end diff --git a/app/views/admin_request/edit.rhtml b/app/views/admin_request/edit.rhtml index f7fca3ce7..b6c84426d 100644 --- a/app/views/admin_request/edit.rhtml +++ b/app/views/admin_request/edit.rhtml @@ -10,7 +10,7 @@ <p><label for="info_request_prominence">Prominence</label> (whether is shown in lists of requests / search or not)<br/> <%= select( 'info_request', "prominence", { "normal" => "normal", "backpage" => "backpage"}) %> - <p><label for="info_request_stop_new_responses">Stop new responses</label> (use this on requests getting spam, but also work out how the email leaked and plug it)<br/> + <p><label for="info_request_stop_new_responses">Stop new responses</label> (by email; use this on requests getting spam, but also work out how the email leaked and plug it)<br/> <%= select('info_request', "stop_new_responses", [["Yes - stop new responses",true],["No - allow new responses",false]]) %> </p> |