X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/75f96fcc9a8f07828d6dc2f487bb00307de7a94f..4330dcdf945bc7ec7964bb544eb2b0cd123a3528:/app/models/notifier.rb?ds=sidebyside

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 7878c601c..36564f614 100644
--- a/app/models/notifier.rb
+++ b/app/models/notifier.rb
@@ -4,10 +4,12 @@ class Notifier < ActionMailer::Base
           :auto_submitted => "auto-generated"
   helper :application
   before_action :set_shared_template_vars
+  before_action :attach_project_logo
 
   def signup_confirm(user, token)
     with_recipient_locale user do
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm",
                      :display_name => user.display_name,
                      :confirm_string => token.token)
@@ -21,6 +23,7 @@ class Notifier < ActionMailer::Base
     with_recipient_locale user do
       @address = user.new_email
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "confirm_email",
                      :confirm_string => token.token)
 
@@ -32,6 +35,7 @@ class Notifier < ActionMailer::Base
   def lost_password(user, token)
     with_recipient_locale user do
       @url = url_for(:host => SERVER_URL,
+                     :protocol => SERVER_PROTOCOL,
                      :controller => "user", :action => "reset_password",
                      :token => token.token)
 
@@ -72,12 +76,14 @@ class Notifier < ActionMailer::Base
       @text = message.body
       @title = message.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "message", :action => "read",
                          :message_id => message.id)
       @replyurl = url_for(:host => SERVER_URL,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(message.sender)
 
@@ -94,23 +100,26 @@ class Notifier < ActionMailer::Base
       @text = comment.body
       @title = comment.diary_entry.title
       @readurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :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,
+                            :protocol => SERVER_PROTOCOL,
                             :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,
+                          :protocol => SERVER_PROTOCOL,
                           :controller => "message",
                           :action => "new",
                           :display_name => comment.user.display_name,
                           :title => "Re: #{comment.diary_entry.title}")
-      @user_message_author = @from_user
+      @author = @from_user
 
       attach_user_avatar(comment.user)
 
@@ -124,12 +133,14 @@ class Notifier < ActionMailer::Base
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = url_for(:host => SERVER_URL,
+                         :protocol => SERVER_PROTOCOL,
                          :controller => "user", :action => "view",
                          :display_name => @friend.befriender.display_name)
       @friendurl = url_for(:host => SERVER_URL,
+                           :protocol => SERVER_PROTOCOL,
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
-      @user_message_author = @friend.befriender.display_name
+      @author = @friend.befriender.display_name
 
       attach_user_avatar(@friend.befriender)
       mail :to => friend.befriendee.email,
@@ -151,7 +162,7 @@ class Notifier < ActionMailer::Base
                      I18n.t("notifier.note_comment_notification.anonymous")
                    end
 
-      @user_message_author = @commenter
+      @author = @commenter
       attach_user_avatar(comment.author)
 
       subject = if @owner
@@ -174,7 +185,7 @@ class Notifier < ActionMailer::Base
       @changeset_comment = comment.changeset.tags["comment"].presence
       @time = comment.created_at
       @changeset_author = comment.changeset.user.display_name
-      @user_message_author = @commenter
+      @author = @commenter
 
       subject = if @owner
                   I18n.t("notifier.changeset_comment_notification.commented.subject_own", :commenter => @commenter)
@@ -192,11 +203,10 @@ class Notifier < ActionMailer::Base
 
   def set_shared_template_vars
     @root_url = root_url(:host => SERVER_URL)
-    attach_project_logo
   end
 
   def attach_project_logo
-    attachments.inline["logo.png"] = File.read("#{Rails.root}/app/assets/images/osm_logo_30.png")
+    attachments.inline["logo.png"] = File.read(Rails.root.join("app", "assets", "images", "osm_logo_30.png"))
   end
 
   def attach_user_avatar(user)
@@ -208,7 +218,7 @@ class Notifier < ActionMailer::Base
     if image && image.file?
       return image.path(:small)
     else
-      return "#{Rails.root}/app/assets/images/users/images/small.png"
+      return Rails.root.join("app", "assets", "images", "users", "images", "small.png")
     end
   end