Merge remote-tracking branch 'upstream/pull/5284'

[rails.git] / app / mailers / user_mailer.rb

diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb
index d1ad60b2cad9c1d9aa2aa6ce150bd77999edc3ce..dee3dafbed35562ab865f11c64fcad4d61e8a067 100644 (file)
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@@ -10,11 +10,12 @@ class UserMailer < ApplicationMailer
   before_action :set_shared_template_vars
   before_action :attach_project_logo
 
   before_action :set_shared_template_vars
   before_action :attach_project_logo
 

-  def signup_confirm(user, token)
+  def signup_confirm(user, token, referer = nil)

     with_recipient_locale user do
       @url = url_for(:controller => "confirmations", :action => "confirm",
                      :display_name => user.display_name,
     with_recipient_locale user do
       @url = url_for(:controller => "confirmations", :action => "confirm",
                      :display_name => user.display_name,

-                     :confirm_string => token.token)
+                     :confirm_string => token,
+                     :referer => referer)

 
       mail :to => user.email,
            :subject => t(".subject")
 
       mail :to => user.email,
            :subject => t(".subject")


@@ -25,7 +26,7 @@ class UserMailer < ApplicationMailer
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:controller => "confirmations", :action => "confirm_email",
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:controller => "confirmations", :action => "confirm_email",

-                     :confirm_string => token.token)
+                     :confirm_string => token)

 
       mail :to => user.new_email,
            :subject => t(".subject")
 
       mail :to => user.new_email,
            :subject => t(".subject")


@@ -34,7 +35,7 @@ class UserMailer < ApplicationMailer
 
   def lost_password(user, token)
     with_recipient_locale user do
 
   def lost_password(user, token)
     with_recipient_locale user do

-      @url = user_reset_password_url(:token => token.token)
+      @url = user_reset_password_url(:token => token)

 
       mail :to => user.email,
            :subject => t(".subject")
 
       mail :to => user.email,
            :subject => t(".subject")


@@ -97,12 +98,21 @@ class UserMailer < ApplicationMailer
       @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
       @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })
       @readurl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "comment#{comment.id}")
       @commenturl = diary_entry_url(comment.diary_entry.user, comment.diary_entry, :anchor => "newcomment")
       @replyurl = new_message_url(comment.user, :message => { :title => "Re: #{comment.diary_entry.title}" })

+      @unsubscribeurl = diary_entry_unsubscribe_url(comment.diary_entry.user, comment.diary_entry)

       @author = @from_user
 
       attach_user_avatar(comment.user)
 
       set_references("diary", comment.diary_entry)
 
       @author = @from_user
 
       attach_user_avatar(comment.user)
 
       set_references("diary", comment.diary_entry)
 

+      set_list_headers(
+        "#{comment.diary_entry.id}.diary.www.openstreetmap.org",
+        t(".description", :id => comment.diary_entry.id),
+        :archive => @readurl,
+        :subscribe => diary_entry_subscribe_url(comment.diary_entry.user, comment.diary_entry),
+        :unsubscribe => @unsubscribeurl
+      )
+

       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.notification_token(recipient.id), recipient.id),
            :to => recipient.email,
            :subject => t(".subject", :user => comment.user.display_name)
       mail :from => from_address(comment.user.display_name, "c", comment.id, comment.notification_token(recipient.id), recipient.id),
            :to => recipient.email,
            :subject => t(".subject", :user => comment.user.display_name)


@@ -141,6 +151,12 @@ class UserMailer < ApplicationMailer
 
       set_references("note", comment.note)
 
 
       set_references("note", comment.note)
 

+      set_list_headers(
+        "#{comment.note.id}.note.www.openstreetmap.org",
+        t(".description", :id => comment.note.id),
+        :archive => @noteurl
+      )
+

       subject = if @owner
                   t(".#{@event}.subject_own", :commenter => @commenter)
                 else
       subject = if @owner
                   t(".#{@event}.subject_own", :commenter => @commenter)
                 else


@@ -161,6 +177,7 @@ class UserMailer < ApplicationMailer
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name

+      @unsubscribe_url = unsubscribe_changeset_url(comment.changeset)

       @author = @commenter
 
       subject = if @owner
       @author = @commenter
 
       subject = if @owner


@@ -173,6 +190,14 @@ class UserMailer < ApplicationMailer
 
       set_references("changeset", comment.changeset)
 
 
       set_references("changeset", comment.changeset)
 

+      set_list_headers(
+        "#{comment.changeset.id}.changeset.www.openstreetmap.org",
+        t(".description", :id => comment.changeset.id),
+        :subscribe => subscribe_changeset_url(comment.changeset),
+        :unsubscribe => @unsubscribe_url,
+        :archive => @changeset_url
+      )
+

       mail :to => recipient.email, :subject => subject
     end
   end
       mail :to => recipient.email, :subject => subject
     end
   end


@@ -222,8 +247,8 @@ class UserMailer < ApplicationMailer
     end
   end
 
     end
   end
 

-  def with_recipient_locale(recipient, &block)
-    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &block)
+  def with_recipient_locale(recipient, &)
+    I18n.with_locale(Locale.available.preferred(recipient.preferred_languages), &)

   end
 
   def from_address(name, type, id, token, user_id = nil)
   end
 
   def from_address(name, type, id, token, user_id = nil)


@@ -245,4 +270,11 @@ class UserMailer < ApplicationMailer
     headers["In-Reply-To"] = ref
     headers["References"] = ref
   end
     headers["In-Reply-To"] = ref
     headers["References"] = ref
   end

+
+  def set_list_headers(id, description, options = {})
+    headers["List-ID"] = "#{description} <#{id}>"
+    headers["List-Archive"] = "<#{options[:archive]}>" if options[:archive]
+    headers["List-Subscribe"] = "<#{options[:subscribe]}>" if options[:subscribe]
+    headers["List-Unsubscribe"] = "<#{options[:unsubscribe]}>" if options[:unsubscribe]
+  end

 end
 end