-
class Notifier < ActionMailer::Base
def signup_confirm(user, token)
recipients user.email
:confirm_string => token.token)
end
+ def email_confirm(user, token)
+ recipients user.new_email
+ from "webmaster@openstreetmap.org"
+ subject "[OpenStreetMap] Confirm your email address"
+ headers "Auto-Submitted" => "auto-generated"
+ body :address => user.new_email,
+ :url => url_for(:host => SERVER_URL,
+ :controller => "user", :action => "confirm_email",
+ :confirm_string => token.token)
+ end
+
def lost_password(user, token)
recipients user.email
from "webmaster@openstreetmap.org"
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"
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"
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"