rails_port_0.5: Merge rails_port.

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 80c1b1f8236b365200102f901c2ecfe2968fe5b0..9eff2fb92eb24cbf488be67240830c3e7ad6b9a8 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://www.openstreetmap.org/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://www.openstreetmap.org/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)


@@ -21,18 +21,32 @@ class Notifier < ActionMailer::Base
     @body['pass'] = pass
   end
 
     @body['pass'] = pass
   end
 

-  def gpx_success(trace)
-    @recipients = user.email
+  def gpx_success(trace, possible_points)
+    @recipients = trace.user.email

     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] GPX Import success'
     @body['trace_name'] = trace.name
     @body['trace_points'] = trace.size
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] GPX Import success'
     @body['trace_name'] = trace.name
     @body['trace_points'] = trace.size

+    @body['possible_points'] = possible_points

   end
 
   end
 

-  def gpx_failure(trace)
-    @recipients = user.email
+  def gpx_failure(trace, error)
+    @recipients = trace.user.email

     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] GPX Import failure'
     @body['trace_name'] = trace.name
     @from = 'abuse@openstreetmap.org'
     @subject = '[OpenStreetMap] GPX Import failure'
     @body['trace_name'] = trace.name

+    @body['error'] = error
+  end
+  
+  def message_notification(message)
+    @recipients = message.recipient.email
+    @from = 'abuse@openstreetmap.org'
+    @subject = "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
+    @body['to_user'] = message.recipient.display_name
+    @body['from_user'] = message.sender.display_name
+    @body['body'] = message.body
+    @body['subject'] = message.title
+    @body['readurl'] = "http://#{SERVER_URL}/message/read/#{message.id}"
+    @body['replyurl'] = "http://#{SERVER_URL}/message/new/#{message.from_user_id}"

   end
 end
   end
 end