Add extra validation to messages and diary entries.

[rails.git] / app / models / notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index b064ee1f0350ff348251668de20a3e80c26fbdf8..aaad67d0ea68a95497ced34dc9111b7eac2baefb 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,17 +1,17 @@
 class Notifier < ActionMailer::Base
 
 class Notifier < ActionMailer::Base
 

-  def signup_confirm( user )
+  def signup_confirm( user, token )

     @recipients = user.email
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] Confirm your email address'
     @recipients = user.email
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] Confirm your email address'

-    @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{user.token}"
+    @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{token.token}"

   end
 
   end
 

-  def lost_password( user )
+  def lost_password( user, token )

     @recipients = user.email
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] Password reset request'
     @recipients = user.email
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] Password reset request'

-    @body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{user.token}"
+    @body['url'] = "http://#{SERVER_URL}/user/reset_password?email=#{user.email}&token=#{token.token}"

   end
 
   def reset_password(user, pass)
   end
 
   def reset_password(user, pass)