X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/791814d74ed95e758f848c38b63d41d3f1b30553..08b71b48e12ed1d34e8a807d913dbf9714635fc6:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 4b80e1de8..aaad67d0e 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,17 +1,17 @@
 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'
-    @body['url'] = 'http://www.openstreetmap.org/user/confirm?confirm_string=' + user.token
+    @body['url'] = "http://#{SERVER_URL}/user/confirm?confirm_string=#{token.token}"
   end
 
-  def lost_password( user )
+  def lost_password( user, token )
     @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)
@@ -21,4 +21,20 @@ class Notifier < ActionMailer::Base
     @body['pass'] = pass
   end
 
+  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
+    @body['possible_points'] = possible_points
+  end
+
+  def gpx_failure(trace, error)
+    @recipients = trace.user.email
+    @from = 'abuse@openstreetmap.org'
+    @subject = '[OpenStreetMap] GPX Import failure'
+    @body['trace_name'] = trace.name
+    @body['error'] = error
+  end
 end