diff options
| -rw-r--r-- | app/models/outgoing_message.rb | 16 | ||||
| -rw-r--r-- | app/models/public_body.rb | 8 | ||||
| -rw-r--r-- | app/models/request_mailer.rb | 18 | ||||
| -rw-r--r-- | app/models/user.rb | 18 |
4 files changed, 16 insertions, 44 deletions
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb index cf3d34142..6ebeb1704 100644 --- a/app/models/outgoing_message.rb +++ b/app/models/outgoing_message.rb @@ -5,7 +5,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: outgoing_message.rb,v 1.7 2007-10-24 17:47:38 francis Exp $ +# $Id: outgoing_message.rb,v 1.8 2007-10-30 14:23:21 francis Exp $ class OutgoingMessage < ActiveRecord::Base belongs_to :info_request @@ -20,19 +20,19 @@ class OutgoingMessage < ActiveRecord::Base # Note: You can test this from script/console with, say: # InfoRequest.find(1).outgoing_messages[0].send_message def send_message - if message_type == 'initial_request' - if status == 'ready' - RequestMailer.deliver_initial_request(info_request, self) + if self.message_type == 'initial_request' + if self.status == 'ready' + RequestMailer.deliver_initial_request(self.info_request, self) self.sent_at = Time.now self.status = 'sent' self.save! - elsif status == 'sent' - raise "Message id #{id} has already been sent" + elsif self.status == 'sent' + raise "Message id #{self.id} has already been sent" else - raise "Message id #{id} not in state for send_message" + raise "Message id #{self.id} not in state for send_message" end else - raise "Message id #{id} has type '#{message_type}' which send_message can't handle" + raise "Message id #{self.id} has type '#{self.message_type}' which send_message can't handle" end end diff --git a/app/models/public_body.rb b/app/models/public_body.rb index fdb398eeb..5f3c4ceb3 100644 --- a/app/models/public_body.rb +++ b/app/models/public_body.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: public_body.rb,v 1.7 2007-10-08 14:51:47 francis Exp $ +# $Id: public_body.rb,v 1.8 2007-10-30 14:23:21 francis Exp $ class PublicBody < ActiveRecord::Base validates_presence_of :request_email @@ -12,11 +12,11 @@ class PublicBody < ActiveRecord::Base has_many :info_requests def validate - unless MySociety::Validate.is_valid_email(request_email) + unless MySociety::Validate.is_valid_email(self.request_email) errors.add(:request_email, "doesn't look like a valid email address") end - if complaint_email != "" - unless MySociety::Validate.is_valid_email(complaint_email) + if self.complaint_email != "" + unless MySociety::Validate.is_valid_email(self.complaint_email) errors.add(:complaint_email, "doesn't look like a valid email address") end end diff --git a/app/models/request_mailer.rb b/app/models/request_mailer.rb index 66e3bd434..758034994 100644 --- a/app/models/request_mailer.rb +++ b/app/models/request_mailer.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_mailer.rb,v 1.4 2007-10-29 18:11:34 francis Exp $ +# $Id: request_mailer.rb,v 1.5 2007-10-30 14:23:21 francis Exp $ class RequestMailer < ActionMailer::Base @@ -38,24 +38,10 @@ class RequestMailer < ActionMailer::Base info_requests.push(info_request) if info_request end - # Deal with each on + # Send the message to each request for info_request in info_requests info_request.receive(email, raw_email) end - - # email.cc - # page = Page.find_by_address(email.to.first) - # page.emails.create( - # :subject => email.subject, :body => email.body - # ) - # - # if email.has_attachments? - # for attachment in email.attachments - # page.attachments.create({ - # :file => attachment, :description => email.subject - # }) - # end - # end end end diff --git a/app/models/user.rb b/app/models/user.rb index 612cd2d65..9a4708c57 100644 --- a/app/models/user.rb +++ b/app/models/user.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: user.rb,v 1.9 2007-10-16 18:52:11 louise Exp $ +# $Id: user.rb,v 1.10 2007-10-30 14:23:21 francis Exp $ require 'digest/sha1' @@ -21,7 +21,7 @@ class User < ActiveRecord::Base def validate errors.add_to_base("Missing password") if hashed_password.blank? - errors.add(:email, "doesn't look like a valid address") unless MySociety::Validate.is_valid_email(email) + errors.add(:email, "doesn't look like a valid address") unless MySociety::Validate.is_valid_email(self.email) end # Return user given login email and password @@ -49,20 +49,6 @@ class User < ActiveRecord::Base private - # XXX - wanted to override initialize to return existing model if - # authentication succeeds, but couldn't get it to work. This would move - # some code from controllers/application.rb - #def initialize(params = {}) - # raise params.to_yaml - # if not params[:email].empty? and not params[:password].empty? - # user = self.authenticate(params[:email], params[:password]) - # if user - # return user - # end - # end - # super - #end - def self.encrypted_password(password, salt) string_to_hash = password + salt # XXX need to add a secret here too? Digest::SHA1.hexdigest(string_to_hash) |