X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/fac305e87b9a2df59064ddad666304ceb3d7f7a7..f1189ae115e27f21b492fdeff9e1a736bdb8e6c0:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 80c1b1f82..b064ee1f0 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,14 +4,14 @@ class Notifier < ActionMailer::Base
     @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=#{user.token}"
   end
 
   def lost_password( user )
     @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=#{user.token}"
   end
 
   def reset_password(user, pass)
@@ -21,18 +21,20 @@ class Notifier < ActionMailer::Base
     @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
+    @body['possible_points'] = possible_points
   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
+    @body['error'] = error
   end
 end