Exclude hidden diary entries and comments from spam scoring

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

diff --git a/app/models/notifier.rb b/app/models/notifier.rb
index 8e386edf84bbcfe2baf78f9c3fc58f91608f2b88..36564f61492a4a60ee08092817d75076d0111f14 100644 (file)
--- 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
           :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,
 
   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)
                      :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,
     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)
 
                      :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,
   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)
 
                      :controller => "user", :action => "reset_password",
                      :token => token.token)
 


@@ -72,9 +76,11 @@ class Notifier < ActionMailer::Base
       @text = message.body
       @title = message.title
       @readurl = url_for(:host => SERVER_URL,
       @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,
                          :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)
       @author = @from_user
                           :controller => "message", :action => "reply",
                           :message_id => message.id)
       @author = @from_user


@@ -94,18 +100,21 @@ class Notifier < ActionMailer::Base
       @text = comment.body
       @title = comment.diary_entry.title
       @readurl = url_for(:host => SERVER_URL,
       @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,
                          :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,
                             :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,
                           :controller => "message",
                           :action => "new",
                           :display_name => comment.user.display_name,


@@ -124,9 +133,11 @@ class Notifier < ActionMailer::Base
     with_recipient_locale friend.befriendee do
       @friend = friend
       @viewurl = url_for(:host => SERVER_URL,
     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,
                          :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)
       @author = @friend.befriender.display_name
                            :controller => "user", :action => "make_friend",
                            :display_name => @friend.befriender.display_name)
       @author = @friend.befriender.display_name


@@ -166,6 +177,7 @@ class Notifier < ActionMailer::Base
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do
 
   def changeset_comment_notification(comment, recipient)
     with_recipient_locale recipient do

+      @to_user = recipient.display_name

       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user
       @changeset_url = changeset_url(comment.changeset, :host => SERVER_URL)
       @comment = comment.body
       @owner = recipient == comment.changeset.user


@@ -191,11 +203,10 @@ class Notifier < ActionMailer::Base
 
   def set_shared_template_vars
     @root_url = root_url(:host => SERVER_URL)
 
   def set_shared_template_vars
     @root_url = root_url(:host => SERVER_URL)

-    attach_project_logo

   end
 
   def 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)
   end
 
   def attach_user_avatar(user)


@@ -207,7 +218,7 @@ class Notifier < ActionMailer::Base
     if image && image.file?
       return image.path(:small)
     else
     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
 
     end
   end