Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

Gemfile

@@ -21,7 +21,8 @@ gem 'acts-as-taggable-on', '2.4.1'
 gem 'spreadsheet'
 gem 'ruby-ole'
 #gem 'email_verifier', path: 'lib/email_verifier'
-
+gem 'rufus-scheduler'
+gem 'dalli', path: 'lib/dalli-2.7.2'
 group :development do
   gem 'grape-swagger'
   gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git'

app/controllers/account_controller.rb

@@ -315,7 +315,7 @@ class AccountController < ApplicationController
     code = /\d*/
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
-    if code=~params[:back_url] && last_login_on != ''
+    if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
       redirect_to user_activities_path(user)
     else
       if last_login_on == ''

app/controllers/bids_controller.rb

@@ -9,7 +9,7 @@ class BidsController < ApplicationController
   menu_item :homework_statistics, :only => :homework_statistics
   menu_item :edit, :only => :edit
 
-
+  before_filter :auth_login1, :only => [:show_courseEx]
 
   before_filter :can_show_course,only: []
   before_filter :can_show_contest,only: []

app/controllers/courses_controller.rb

@@ -5,6 +5,7 @@ class CoursesController < ApplicationController
   helper :members
   helper :words
 
+  before_filter :auth_login1, :only => [:show, :feedback]
   menu_item :overview
   menu_item :feedback, :only => :feedback
   menu_item :homework, :only => :homework

app/controllers/files_controller.rb

@@ -20,7 +20,7 @@ class FilesController < ApplicationController
     layout 'base_projects' #by young
 
   menu_item :files
-
+  before_filter :auth_login1, :only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
   before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
 

app/controllers/messages_controller.rb

@@ -17,6 +17,7 @@
 
 class MessagesController < ApplicationController
   include ApplicationHelper
+  before_filter :authorize1, :only => [:show]
   menu_item :boards
   default_search_scope :messages
   before_filter :find_board, :only => [:new, :preview,:edit]

app/controllers/news_controller.rb

@@ -17,6 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base_projects'# by young
+  before_filter :authorize1, :only => [:show]
   default_search_scope :news
   model_object News
   before_filter :find_model_object, :except => [:new, :create, :index]

app/controllers/projects_controller.rb

@@ -19,7 +19,7 @@
 # Description 封装代码,简化代码，格式化代码，
 class ProjectsController < ApplicationController
   layout :select_project_layout
-
+  before_filter :authorize1, :only => [:show]
   menu_item :overview, :only => :show
   menu_item :roadmap, :only => :roadmap
   menu_item :settings, :only => :settings
@@ -249,6 +249,17 @@ class ProjectsController < ApplicationController
   # Description  项目动态展示方法，删除了不必要的代码
   def show
     # 试图跳转到请求的按钮
+    if params[:login]
+      login = params[:login]
+      login = login.sub(/%40/,'@')
+      mail = params[:login]
+      password = params[:password]
+      us = UsersService.new
+      user = us.register_auto(login,mail, password)
+      Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id)
+      UserGrade.create(:user_id => user.id, :project_id => @project.id)
+      User.current = user unless User.current.nil?
+    end
     if params[:jump] && redirect_to_project_menu_item(@project, params[:jump])
       return
     end

app/controllers/users_controller.rb

@@ -18,7 +18,7 @@ class UsersController < ApplicationController
 
   layout :setting_layout
   #Added by young
-  before_filter :auth_login1, :only => [:show, :user_activities]
+  before_filter :auth_login1, :only => [:show, :user_activities, :user_newfeedback]
   menu_item :activity
   menu_item :user_information, :only => :info
   menu_item :user_course, :only => :user_courses

app/models/forum_observer.rb

@@ -1,8 +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
+  # def after_create(forum)
+  #   Thread.start do
+  #     Mailer.forum_add(forum).deliver if Setting.notified_events.include?('forum_add')
+  #   end
+  #
+  # end
 end

app/models/journals_for_message.rb

@@ -22,8 +22,8 @@ class JournalsForMessage < ActiveRecord::Base
              :foreign_key => 'jour_id',
              :conditions => "#{self.table_name}.jour_type = 'Project' "
   belongs_to :course,
-             :foreign_key => 'jour_id',
-             :conditions => "#{self.table_name}.jour_type = 'Course' "
+             :foreign_key => 'jour_id'
+
 
   belongs_to :jour, :polymorphic => true
   belongs_to :user

app/models/mailer.rb

@@ -27,21 +27,104 @@ class Mailer < ActionMailer::Base
     { :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
-    @issue_author_url = url_for(user_activities_url(@author))
-    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
-    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
+  # author: alan
+  # 发送邀请未注册用户加入项目邮件
+  # 功能： 在加入项目的同时自动注册用户
+  def  send_invite_in_project(email, project, invitor)
+    @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} "
+    password = newpass(6)
+    @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id,
+                           :password => password,  :login => email)
+    mail :to => email, :subject => @subject
+  end
+
+  # author: alan
+  # 根据用户选择发送个人日报或周报
+  # 发送内容： 项目【缺陷，讨论区，新闻】，课程【通知，留言，新闻】， 贴吧， 个人留言
+  def send_for_user_activities(user, date_to, days)
+    date_from = date_to - days.days
+
+    # 生成token用于直接点击登录
+    @user = user
+    token = Token.new(:user =>user , :action => 'autologin')
+    token.save
+    @token = token
+
+    @user_url = url_for(my_account_url(user,:token => @token.value))
+    # 查询user参加的项目及课程
+    projects = user.projects
+    courses = user.courses
+    project_ids = projects.map{|project| project.id}.join(",")
+    course_ids = courses.map {|course| course.id}.join(",")
+
+    # 查询user的缺陷，包括发布的，跟踪的以及被指派的缺陷
+    @issues = Issue.find_by_sql("select DISTINCT i.* from issues i, watchers w
+                        where (i.assigned_to_id = #{user.id} or i.author_id = #{user.id}
+                                or (w.watchable_type = 'Issue' and w.watchable_id = i.id and w.user_id = #{user.id}))
+                            and (i.created_on between '#{date_from}' and '#{date_to}') order by i.created_on desc")
+
+    # @bids 查询课程作业，包括老师发布的作业，以及user提交作业
+    # @attachments查询课程课件更新
+    @attachments ||= []
+
+    @bids ||= []  # 老师发布的作业
+
+    unless courses.first.nil?
+      count = courses.count
+      count = count - 1
+      for i in 0..count do
+        bids =  courses[i].homeworks.where("bids.created_on between '#{date_from}' and '#{date_to}'").order("bids.created_on desc")
+        attachments = courses[i].attachments.where("attachments.created_on between '#{date_from}' and '#{date_to}'").order('attachments.created_on DESC')
+        @bids += bids if bids.count > 0 
+        @attachments += attachments if attachments.count > 0 
+      end
+    end
+    # user 提交的作业
+    @homeworks = HomeworkAttach.where("user_id=#{user.id} and (created_at between '#{date_from}' and '#{date_to}')").order("created_at desc")
+
+    # 查询user在课程。项目中发布的讨论帖子
+    messages = Message.find_by_sql("select DISTINCT * from messages where author_id = #{user.id} and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    @course_messages ||= []
+    @project_messages ||= []
+    unless messages.first.nil?
+      messages.each do |msg|
+        if msg.project
+          @project_messages << msg
+        elsif msg.course
+          @course_messages << msg
+        end
+      end
+    end
+    #  查询user在课程中发布的通知，项目中发的新闻
+    @course_news = News.find_by_sql("select DISTINCT n.*  from news n
+                                                where n.course_id in (#{course_ids})
+                                                    and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    @project_news = News.find_by_sql("select DISTINCT n.* from news n where  n.project_id in (#{project_ids})
+                                                     and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+
+    # 查询user在课程及个人中留言
+    @course_journal_messages = JournalsForMessage.find_by_sql("select DISTINCT * from journals_for_messages where
+                                                  jour_type='Course' and user_id = #{user.id}
+                                                  and (created_on between '#{date_from}' and '#{date_to}') order by created_on desc")
+    @user_journal_messages = user.journals_for_messages.where("m_parent_id IS NULL and (created_on between '#{date_from}' and '#{date_to}')").order('created_on DESC')
+
+
+    # 查询user新建贴吧或发布帖子
+    @forums = Forum.find_by_sql("select  DISTINCT * from forums where creator_id = #{user.id} and (created_at between '#{date_from}' and '#{date_to}') order by created_at desc")
+    @memos = Memo.find_by_sql("select DISTINCT m.* from memos m, forums f where (m.author_id = #{user.id} or (m.forum_id = f.id and f.creator_id = #{user.id}))
+                           and (m.created_at between '#{date_from}' and '#{date_to}')  order by m.created_at desc")
+    if days == 1
+      subject = "[ #{user.show_name} : #{l(:label_day_mail)}]"
+      @subject = " #{user.show_name} : #{date_to - 1.days}  #{l(:label_day_mail)}"
+    else
+      subject = "[ #{user.show_name} :  #{l(:label_week_mail)}]"
+      @subject = "#{user.show_name} : #{l(:label_week_mail)}"
+    end
+    mail :to => user.mail,:subject => subject
 
   end
 
+
   def forum_message_added(memo)
     @memo = memo
     redmine_headers 'Memo' => memo.id
@@ -50,15 +133,12 @@ class Mailer < ActionMailer::Base
     @forum_url = url_for(:controller => 'forums', :action => 'show', :id => @forum.id)
     @issue_author_url = url_for(user_activities_url(@author))
     recipients ||= []
-    # if !memo.parent_id.nil?
-    #   mems = memo.self_and_siblings
-    #   mems.each do |mem|
-    #     recipients << mem.author.mail unless recipients.include? mem.author.mail
-    #   end
-    # else
-    #   recipients << memo.author.mail
-    # end
-    recipients << @author.mail
+    if @forum.author.mail_notification != 'day' && @forum.author.mail_notification != 'week'
+      recipients << @forum.creator.mail
+    end
+    if @author.mail_notification != 'day' && @author.mail_notification != 'week'
+      recipients << @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)))
@@ -93,6 +173,17 @@ class Mailer < ActionMailer::Base
                Rails.logger.error "[Builds a Mail::Message ERROR] journalsForMessage's jour is unkown type, journalsForMessage.id = #{journals_for_message.id}"
                return -1
            end
+
+    # 验证用户的收取邮件的方式
+    recipients ||= []
+    recipients1 ||= []
+    if @mail.mail_notification != 'week' && @mail.mail_notification != 'day'
+      recipients1 = @mail.mail
+    end
+    if journals_for_message.jour.author.mail_notification != 'week' && journals_for_message.jour.author.mail_notification != 'day'
+      recipients = journals_for_message.jour.author.mail
+    end
+
     # modify by nwb
     #如果是直接留言并且留言对象是课程
     if !journals_for_message.at_user && journals_for_message.jour.class.to_s.to_sym == :Course
@@ -103,7 +194,9 @@ class Mailer < ActionMailer::Base
       #收件人邮箱
       @recipients ||= []
       @members.each do |teacher|
+        if teacher.user.mail_notification != 'week' && teacher.user.mail_notification != 'day'
           @recipients << teacher.user.mail
+        end
       end
       mail :to => @recipients,
            :subject => "#{l(:label_your_course)}#{journals_for_message.jour.name}#{l(:label_have_message)} "
@@ -111,14 +204,15 @@ class Mailer < ActionMailer::Base
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1
       end
-        mail :to => journals_for_message.jour.author.mail, :subject => @title
+
+      mail :to => recipients, :subject => @title
     elsif journals_for_message.jour.class.to_s.to_sym == :Contest
       if !journals_for_message.jour.author.notify_about? journals_for_message
         return -1
       end
-      mail :to => journals_for_message.jour.author.mail, :subject => @title
+      mail :to => recipients, :subject => @title
     else
-      mail :to => @mail.mail, :subject => @title
+      mail :to => recipients1, :subject => @title
     end
 
 
@@ -140,7 +234,6 @@ class Mailer < ActionMailer::Base
     @author = issue.author
     @issue = issue
     user = User.find_by_mail(recipients)
-
     token = Token.new(:user =>user , :action => 'autologin')
     token.save
      @token = token
@@ -196,12 +289,6 @@ class Mailer < ActionMailer::Base
     @user_url = url_for(my_account_url(user,:token => @token.value))
 
       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
-
-
-
-
-
-
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
@@ -752,4 +839,13 @@ class Mailer < ActionMailer::Base
       end
     end
   end
+
+  # author: alan
+  # 功能： 生成len位随机字符串
+  def newpass(len)
+    chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
+    newpass = ""
+    1.upto(len) { |i| newpass << chars[rand(chars.size-1)] }
+    return newpass
+  end
 end

app/models/user.rb

@@ -24,7 +24,7 @@ class User < Principal
   DEVELOPER = 3
   
   include Redmine::SafeAttributes
-
+  seems_rateable_rater
   # Different ways of displaying/sorting users
   USER_FORMATS = {
     :firstname_lastname => {
@@ -66,10 +66,8 @@ class User < Principal
 
   MAIL_NOTIFICATION_OPTIONS = [
     ['all', :label_user_mail_option_all],
-    ['selected', :label_user_mail_option_selected],
-    ['only_my_events', :label_user_mail_option_only_my_events],
-    ['only_assigned', :label_user_mail_option_only_assigned],
-    ['only_owner', :label_user_mail_option_only_owner],
+    ['week', :label_user_mail_option_week],
+    ['day', :label_user_mail_option_day],
     ['none', :label_user_mail_option_none]
   ]
 
@@ -149,7 +147,7 @@ class User < Principal
   scope :by_join_date, order("created_on DESC")
   #############################  added by liuping  关注
   acts_as_watchable 
-  seems_rateable_rater
+
   has_one :user_extensions,:dependent => :destroy
   ## end
 
@@ -188,7 +186,7 @@ class User < Principal
   validates_confirmation_of :password, :allow_nil => true
   validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
   validate :validate_password_length
-  #validates_email_realness_of :mail
+  # validates_email_realness_of :mail
   before_create :set_mail_notification
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy

app/services/users_service.rb

@@ -44,7 +44,31 @@ class UsersService
     #location = get_user_location @user
     #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction}
   end
+  def register_auto(login,mail,password)
+    @user = User.new
+    @user.admin = false
+    @user.register
+    @user.login = login
+    @user.mail =mail
+    password_confirmation = password
+    should_confirmation_password = true
+    if !password.blank? && !password_confirmation.blank? && should_confirmation_password
+      @user.password, @user.password_confirmation = password, password_confirmation
+    elsif !password.blank? && !should_confirmation_password
+      @user.password = password
+    else
+      @user.password = ""
+    end
+
+    @user = automatically_register(@user)
 
+    if @user.id != nil
+      ue = @user.user_extensions ||= UserExtensions.new
+      ue.user_id = @user.id
+      ue.save
+    end
+    @user
+  end
   #显示用户
   #id用户id
   def show_user(params)

app/views/mailer/send_invite_in_project.html.erb

@@ -0,0 +1,17 @@
+
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+        	<p><%= @subject %> </p>
+           <p> <%= link_to @project_url, @project_url%></p>
+        </span>
+    </li>
+
+  </ul>
+
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>
+
+

app/views/mailer/send_invite_in_project.text.erb

@@ -0,0 +1,2 @@
+<%= @subject %>
+<%= link_to @project_url, @project_url%>

config/application.rb

@@ -17,9 +17,7 @@ module RedmineApp
     # -- all .rb files in that directory are automatically loaded.
 
     #verifier if email is real
-    # EmailVerifier.config do |config|
-    #   config.verifier_email = "lizanle521@126.com"
-    # end
+   
 
     config.generators do |g|
          g.test_framework :rspec,

config/database.yml.example

@@ -1,52 +0,0 @@
-# Default setup is given for MySQL with ruby1.9. If you're running Redmine
-# with MySQL and ruby1.8, replace the adapter name with `mysql`.
-# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
-# Line indentation must be 2 spaces (no tabs).
-
-production:
-  adapter: mysql2
-  database: redmine
-  host: localhost
-  username: root
-  password: ""
-  encoding: utf8
-
-development:
-  adapter: mysql2
-  database: redmine_development
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql2
-  database: redmine_test
-  host: 10.107.17.20
-  username: root
-  password: "1234"
-  encoding: utf8
-
-# PostgreSQL configuration example
-#production:
-#  adapter: postgresql
-#  database: redmine
-#  host: localhost
-#  username: postgres
-#  password: "postgres"
-
-# SQLite3 configuration example
-#production:
-#  adapter: sqlite3
-#  database: db/redmine.sqlite3
-
-# SQL Server configuration example
-#production:
-#  adapter: sqlserver
-#  database: redmine
-#  host: localhost
-#  username: jenkins
-#  password: jenkins

config/environments/development.rb

@@ -8,10 +8,12 @@ RedmineApp::Application.configure do
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils        = true
   config.logger = Logger.new('log/development.log', 'daily') # daily, weekly or monthly
+
+
   # Show full error reports and disable caching
   config.consider_all_requests_local = true
-  config.action_controller.perform_caching             = false
-  config.cache_store = :file_store,  "#{Rails.root }/public/tmp/"
+  config.action_controller.perform_caching             = true
+  config.cache_store = :dalli_store
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true
 

config/environments/production.rb

@@ -3,7 +3,7 @@ RedmineApp::Application.configure do
   # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
-
+  config.cache_store = :dalli_store
   #####
   # Customize the default logger (http://ruby-doc.org/core/classes/Logger.html)
   #

config/initializers/send_mail.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'rufus-scheduler'
+
+#users = User.where("mail_notification = 'week' or mail_notification = 'day'")
+
+scheduler = Rufus::Scheduler.new
+scheduler.cron('0 0 * * 1') do
+  users = User.where("mail_notification = 'week'")
+  users.each do |user|
+  #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+    Thread.start do
+      Mailer.send_for_user_activities(user, Date.today, 7).deliver
+    end
+  end
+end
+scheduler.cron('0 0 * * *') do
+  users = User.where("mail_notification = 'day'")
+  users.each do |user|
+    #Rails.logger.info "send mail to #{user.show_name}(#{user.mail}) at #{Time.now}"
+    Thread.start do
+      Mailer.send_for_user_activities(user, Date.today, 1).deliver
+    end
+  end
+end
+

config/initializers/session_store.rb

@@ -0,0 +1 @@
+Rails.application.config.session_store ActionDispatch::Session::CacheStore, :expire_after => 20.minutes