X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5fbc8ad3f471fde8c5defedc41bbb8374e13abdb..f8367c3ee1418548b5397b6a21f287c2407963e1:/app/models/notifier.rb

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index f6870a8ad..ebf5af641 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -28,26 +28,30 @@ class Notifier < ActionMailer::Base
   end
 
   def gpx_success(trace, possible_points)
-    recipients trace.user.email
+    recipients trace.user.email if trace.user.email_valid
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import success"
     headers "Auto-Submitted" => "auto-generated"
     body :trace_name => trace.name,
          :trace_points => trace.size,
+         :trace_description => trace.description,
+         :trace_tags => trace.tags,
          :possible_points => possible_points
   end
 
   def gpx_failure(trace, error)
-    recipients trace.user.email
+    recipients trace.user.email if trace.user.email_valid
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] GPX Import failure"
     headers "Auto-Submitted" => "auto-generated"
     body :trace_name => trace.name,
+         :trace_description => trace.description,
+         :trace_tags => trace.tags,
          :error => error
   end
   
   def message_notification(message)
-    recipients message.recipient.email
+    recipients message.recipient.email if message.recipient.email_valid
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{message.sender.display_name} sent you a new message"
     headers "Auto-Submitted" => "auto-generated"
@@ -64,7 +68,7 @@ class Notifier < ActionMailer::Base
   end
 
   def diary_comment_notification(comment)
-    recipients comment.diary_entry.user.email
+    recipients comment.diary_entry.user.email if comment.diary_entry.user.email_valid
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{comment.user.display_name} commented on your diary entry"
     headers "Auto-Submitted" => "auto-generated"
@@ -95,7 +99,7 @@ class Notifier < ActionMailer::Base
     befriender = User.find_by_id(friend.user_id)
     befriendee = User.find_by_id(friend.friend_user_id)
 
-    recipients befriendee.email
+    recipients befriendee.email if  befriendee.email_valid
     from "webmaster@openstreetmap.org"
     subject "[OpenStreetMap] #{befriender.display_name} added you as a friend"
     headers "Auto-Submitted" => "auto-generated"