From 432e3a05f2be310b92d0577a37d36e8d707ddafd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 22 Jan 2015 16:30:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=B4=E5=90=A7=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=EF=BC=8C=E5=8F=91=E5=B8=96=E6=97=B6=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=8A=E9=82=AE=E4=BB=B6=E9=87=8D=E5=8F=91=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb          |  13 +-
 app/models/forum.rb                           |   7 +-
 app/models/forum_observer.rb                  |   8 ++
 app/models/mailer.rb                          | 130 ++++++++++++++----
 app/models/memo.rb                            |   8 +-
 app/models/memo_observer.rb                   |   8 ++
 app/models/project.rb                         |   2 +-
 app/views/mailer/forum_add.html.erb           |   4 +
 app/views/mailer/forum_add.text.erb           |   4 +
 app/views/mailer/forum_message_added.html.erb |   4 +
 app/views/mailer/forum_message_added.text.erb |   5 +
 app/views/mailer/message_posted.html.erb      |   8 +-
 config/locales/en.yml                         |   2 +
 config/locales/zh.yml                         |   2 +
 lib/redmine/notifiable.rb                     |   2 +
 spec/models/forum_observer_spec.rb            |   5 +
 spec/models/memo_observer_spec.rb             |   5 +
 17 files changed, 178 insertions(+), 39 deletions(-)
 create mode 100644 app/models/forum_observer.rb
 create mode 100644 app/models/memo_observer.rb
 create mode 100644 app/views/mailer/forum_add.html.erb
 create mode 100644 app/views/mailer/forum_add.text.erb
 create mode 100644 app/views/mailer/forum_message_added.html.erb
 create mode 100644 app/views/mailer/forum_message_added.text.erb
 create mode 100644 spec/models/forum_observer_spec.rb
 create mode 100644 spec/models/memo_observer_spec.rb

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 03d1454ef..54b8c6305 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -160,12 +160,15 @@ class ForumsController < ApplicationController
   def create
     @forum = Forum.new(params[:forum])
     @forum.creator_id = User.current.id
+    if @forum.save
+      respond_to do |format|
 
-    respond_to do |format|
-      if @forum.save
-        format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
-        format.json { render json: @forum, status: :created, location: @forum }
-      else
+          format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+          format.json { render json: @forum, status: :created, location: @forum }
+      end
+
+    else
+      respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 61ba528a0..eb8bb19d2 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -18,7 +18,7 @@ class Forum < ActiveRecord::Base
   
   acts_as_taggable
   scope :by_join_date, order("created_at DESC")
-
+  after_create :send_email
   def reset_counters!
     self.class.reset_counters!(id)
   end
@@ -33,6 +33,11 @@ class Forum < ActiveRecord::Base
     self.creator == user || user.admin?
   end
 
+  def send_email
+    Thread.start do
+      Mailer.forum_add(self).deliver if Setting.notified_events.include?('forum_add')
+    end
+  end
   # Updates topic_count, memo_count and last_memo_id attributes for +board_id+
   def self.reset_counters!(forum_id)
     forum_id = forum_id.to_i
diff --git a/app/models/forum_observer.rb b/app/models/forum_observer.rb
new file mode 100644
index 000000000..1c514d6ab
--- /dev/null
+++ b/app/models/forum_observer.rb
@@ -0,0 +1,8 @@
+class ForumObserver < ActiveRecord::Observer
+  def after_create(forum)
+    Thread.start do
+      Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
+    end
+
+  end
+end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2cd069175..02684a187 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -26,7 +26,37 @@ class Mailer < ActionMailer::Base
   def self.default_url_options
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
-  
+
+  # 贴吧新建贴吧发送邮件
+  # example Mailer.forum(forum).deliver
+  def forum_add(forum)
+
+    redmine_headers 'Forum' => forum.id
+    @forum = forum
+    @author = forum.creator
+    recipients = forum.creator.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
+    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
+
+  end
+
+  def forum_message_added(memo)
+    @memo = memo
+    redmine_headers 'Memo' => memo.id
+    @forum = memo.forum
+    @author = memo.author
+    recipients ||= []
+    mems = memo.self_and_siblings
+    mems.each do |mem|
+      recipients << mem.author.mail unless recipients.include? mem.author.mail
+    end
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
+    mail :to => recipients,:subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]"
+  end
   # Builds a Mail::Message object used to email recipients of the added journals for message.
 
   # 留言分为直接留言，和对留言人留言的回复
@@ -282,7 +312,7 @@ class Mailer < ActionMailer::Base
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Course'
         added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
-        added_to = "#{l(:label_course)}: #{container}"
+        added_to = "#{l(:label_course)}: #{container.name}"
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Version'
         added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
@@ -323,13 +353,25 @@ class Mailer < ActionMailer::Base
   #   news_added(news) => Mail::Message object
   #   Mailer.news_added(news).deliver => sends an email to the news' project recipients
   def news_added(news)
-    redmine_headers 'Project' => news.project.identifier
-    @author = news.author
-    message_id news
-    @news = news
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-      :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = news.author
+      message_id news
+      @news = news
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+        :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif  news.course
+      redmine_headers 'Course' => news.course.id
+      @author = news.author
+      message_id news
+      @news = news
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news comment is added.
@@ -339,15 +381,28 @@ class Mailer < ActionMailer::Base
   #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
   def news_comment_added(comment)
     news = comment.commented
-    redmine_headers 'Project' => news.project.identifier
-    @author = comment.author
-    message_id comment
-    @news = news
-    @comment = comment
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-     :cc => news.watcher_recipients,
-     :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+       :cc => news.watcher_recipients,
+       :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif news.course
+      redmine_headers 'Course' => news.course.id
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of the specified message that was posted.
@@ -356,18 +411,33 @@ class Mailer < ActionMailer::Base
   #   message_posted(message) => Mail::Message object
   #   Mailer.message_posted(message).deliver => sends an email to the recipients
   def message_posted(message)
-    redmine_headers 'Project' => message.project.identifier,
-                    'Topic-Id' => (message.parent_id || message.id)
-    @author = message.author
-    message_id message
-    references message.parent unless message.parent.nil?
-    recipients = message.recipients
-    cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
-    @message = message
-    @message_url = url_for(message.event_url)
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    if message.project
+      redmine_headers 'Project' => message.project.identifier,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.recipients
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+        :cc => cc,
+        :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    elsif message.course
+      redmine_headers 'Course' => message.course.id,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+           :cc => cc,
+           :subject => "[#{message.board.course.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was added.
diff --git a/app/models/memo.rb b/app/models/memo.rb
index cfc509923..f9482911a 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -43,7 +43,7 @@ class Memo < ActiveRecord::Base
 					"parent_id",
 					"replies_count"
 
-	after_create :add_author_as_watcher, :reset_counters!#,:be_user_score -- 公共区发帖暂不计入得分
+	after_create :add_author_as_watcher, :reset_counters!, :sendmail#,:be_user_score -- 公共区发帖暂不计入得分
 	# after_update :update_memos_forum
 	after_destroy :reset_counters!#,:down_user_score  -- 公共区发帖暂不计入得分
 	# after_create :send_notification
@@ -54,6 +54,12 @@ class Memo < ActiveRecord::Base
 	# 	includes(:forum => ).where()
 	# }
 
+  def sendmail
+    thread1=Thread.new do
+      Mailer.forum_message_added(self).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+
 	def cannot_reply_to_locked_topic
 		errors.add :base, l(:label_memo_locked) if root.locked? && self != root
 	end
diff --git a/app/models/memo_observer.rb b/app/models/memo_observer.rb
new file mode 100644
index 000000000..66cabe923
--- /dev/null
+++ b/app/models/memo_observer.rb
@@ -0,0 +1,8 @@
+class MemoObserver < ActiveRecord::Observer
+  def after_create(memo)
+
+    thread1=Thread.new do
+      Mailer.forum_message_added(memo).deliver if Setting.notified_events.include?('forum_message_added')
+    end
+  end
+end
diff --git a/app/models/project.rb b/app/models/project.rb
index 14763347f..01e6cd91c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -600,7 +600,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues
diff --git a/app/views/mailer/forum_add.html.erb b/app/views/mailer/forum_add.html.erb
new file mode 100644
index 000000000..8da8b7891
--- /dev/null
+++ b/app/views/mailer/forum_add.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@forum.name), @forum_url) %></h1>
+<em><%=h @forum.creator.name %></em>
+
+<%= @forum.description.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_add.text.erb b/app/views/mailer/forum_add.text.erb
new file mode 100644
index 000000000..ba7246a49
--- /dev/null
+++ b/app/views/mailer/forum_add.text.erb
@@ -0,0 +1,4 @@
+<%= @forum_url %>
+<%= @author.name %>
+
+<%= @forum.description %>
diff --git a/app/views/mailer/forum_message_added.html.erb b/app/views/mailer/forum_message_added.html.erb
new file mode 100644
index 000000000..743c06ae7
--- /dev/null
+++ b/app/views/mailer/forum_message_added.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@memo.subject), @memo_url) %></h1>
+<em><%=h @memo.author.name %></em>
+
+<%= @memo.content.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_message_added.text.erb b/app/views/mailer/forum_message_added.text.erb
new file mode 100644
index 000000000..bd084cd40
--- /dev/null
+++ b/app/views/mailer/forum_message_added.text.erb
@@ -0,0 +1,5 @@
+<%= @memo_url %>
+<%= @author.name %>
+
+<%= @memo.subject %>
+<%= @memo.content %>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..4bb487405 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,10 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
+<h1>
+  <% if @message.project %>
+      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% elsif @message.course %>
+      <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% end %>
+</h1>
 <em><%=h @message.author %></em>
 
 <%= textilizable(@message, :content, :only_path => false) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d25ba6ae2..ab248a062 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -568,6 +568,8 @@ en:
   label_document_new: New document
   label_document_plural: Documents
   label_document_added: Document added
+  label_forum_message_added: Message added
+  label_forum_add: Forum added
   label_document_public_info: "If you don't choose public, only the project's members can see the document."
   label_role: Role
   label_role_plural: Roles
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bd6c6dc22..815dd6fa1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -581,6 +581,8 @@ zh:
   label_document_new: 新建文档
   label_document_plural: 文档
   label_document_added: 文档已添加
+  label_forum_message_added: 发帖成功
+  label_forum_add: 贴吧创建成功
   label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
   label_role: 角色
   label_role_plural: 角色
diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb
index 88ca9d776..42a81980f 100644
--- a/lib/redmine/notifiable.rb
+++ b/lib/redmine/notifiable.rb
@@ -20,6 +20,8 @@ module Redmine
       notifications << Notifiable.new('message_posted')
       notifications << Notifiable.new('wiki_content_added')
       notifications << Notifiable.new('wiki_content_updated')
+      notifications << Notifiable.new('forum_add')
+      notifications << Notifiable.new('forum_message_added', 'forum_add')
       notifications
     end
   end
diff --git a/spec/models/forum_observer_spec.rb b/spec/models/forum_observer_spec.rb
new file mode 100644
index 000000000..76d68fafa
--- /dev/null
+++ b/spec/models/forum_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ForumObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/memo_observer_spec.rb b/spec/models/memo_observer_spec.rb
new file mode 100644
index 000000000..82603ba7a
--- /dev/null
+++ b/spec/models/memo_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe MemoObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end