Allow users to send themselves a new confirmation email

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 4b80e1de8212dec993662130acf6501cf5e923aa..e6058d4b7374e486e51e37ce91e7b1707047c092 100644 (file)
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -1,24 +1,113 @@
 class Notifier < ActionMailer::Base
 class Notifier < ActionMailer::Base

+  def signup_confirm(user, token)
+    common_headers user
+    subject I18n.t('notifier.signup_confirm.subject')
+    body :url => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "confirm",
+                         :display_name => user.display_name,
+                         :confirm_string => token.token)
+  end
+
+  def email_confirm(user, token)
+    common_headers user
+    recipients user.new_email
+    subject I18n.t('notifier.email_confirm.subject')
+    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)
+    common_headers user
+    subject I18n.t('notifier.lost_password.subject')
+    body :url => url_for(:host => SERVER_URL,
+                         :controller => "user", :action => "reset_password",
+                         :token => token.token)
+  end
+
+  def gpx_success(trace, possible_points)
+    common_headers trace.user
+    subject I18n.t('notifier.gpx_notification.success.subject')
+    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)
+    common_headers trace.user
+    from "webmaster@openstreetmap.org"
+    subject I18n.t('notifier.gpx_notification.failure.subject')
+    body :trace_name => trace.name,
+         :trace_description => trace.description,
+         :trace_tags => trace.tags,
+         :error => error
+  end
+  
+  def message_notification(message)
+    common_headers message.recipient
+    from_header message.sender.display_name, "m", message.id, message.digest
+    subject I18n.t('notifier.message_notification.subject_header', :subject => message.title, :locale => locale)
+    body :to_user => message.recipient.display_name,
+         :from_user => message.sender.display_name,
+         :body => message.body,
+         :title => message.title,
+         :readurl => url_for(:host => SERVER_URL,
+                             :controller => "message", :action => "read",
+                             :message_id => message.id),
+         :replyurl => url_for(:host => SERVER_URL,
+                              :controller => "message", :action => "reply",
+                              :message_id => message.id)
+  end

 
 

-  def signup_confirm( user )
-    @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
+  def diary_comment_notification(comment)
+    common_headers comment.diary_entry.user
+    from_header comment.user.display_name, "c", comment.id, comment.digest
+    subject I18n.t('notifier.diary_comment_notification.subject', :user => comment.user.display_name, :locale => locale)
+    body :to_user => comment.diary_entry.user.display_name,
+         :from_user => comment.user.display_name,
+         :body => comment.body,
+         :title => comment.diary_entry.title,
+         :readurl => url_for(:host => SERVER_URL,
+                             :controller => "diary_entry",
+                             :action => "view",
+                             :display_name => comment.diary_entry.user.display_name,
+                             :id => comment.diary_entry.id,
+                             :anchor => "comment#{comment.id}"),
+         :commenturl => url_for(:host => SERVER_URL,
+                                :controller => "diary_entry",
+                                :action => "view",
+                                :display_name => comment.diary_entry.user.display_name,
+                                :id => comment.diary_entry.id,
+                                :anchor => "newcomment"),
+         :replyurl => url_for(:host => SERVER_URL,
+                              :controller => "message",
+                              :action => "new",
+                              :display_name => comment.user.display_name,
+                              :title => "Re: #{comment.diary_entry.title}")

   end
 
   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}"
+  def friend_notification(friend)
+    common_headers friend.befriendee
+    subject I18n.t('notifier.friend_notification.subject', :user => friend.befriender.display_name, :locale => locale)
+    body :friend => friend

   end
 
   end
 

-  def reset_password(user, pass)
-    @recipients = user.email
-    @from = 'abuse@openstreetmap.org'
-    @subject = '[OpenStreetMap] Password reset'
-    @body['pass'] = pass
+private
+
+  def common_headers(recipient)
+    recipients recipient.email
+    locale recipient.preferred_language_from(I18n.available_locales)
+    from EMAIL_FROM
+    headers "return-path" => EMAIL_RETURN_PATH,
+            "Auto-Submitted" => "auto-generated"

   end
 
   end
 

+  def from_header(name, type, id, digest)
+    if domain = MESSAGES_DOMAIN
+      from quote_address_if_necessary("#{name} <#{type}-#{id}-#{digest[0,6]}@#{domain}>", "utf-8")
+    end
+  end

 end
 end