Merge branch 'szzh' into dev_zanle

Conflicts:
	Gemfile
	app/controllers/projects_controller.rb
	config/locales/zh.yml

.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch

@@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value=""/>
 <stringAttribute key="browserNature" value="Firefox"/>
 <stringAttribute key="externalBaseUrl" value=""/>

.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch

@@ -2,6 +2,7 @@
 <launchConfiguration type="com.aptana.js.debug.core.webbrowserLaunchConfigurationType">
 <booleanAttribute key="advancedRunEnabled" value="false"/>
 <booleanAttribute key="appendProjectName" value="true"/>
+<stringAttribute key="browserCmdLine" value=""/>
 <stringAttribute key="browserExecutable" value="C:\Program Files (x86)\Internet Explorer\iexplore.exe"/>
 <stringAttribute key="browserNature" value="Internet Explorer"/>
 <stringAttribute key="externalBaseUrl" value=""/>

.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

app/controllers/account_controller.rb

@@ -345,7 +345,10 @@ class AccountController < ApplicationController
     if user.save and token.save
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
       Mailer.register(token).deliver
+
+
       flash[:notice] = l(:notice_account_register_done)
+
       render action: 'email_valid', locals: {:mail => user.mail}
     else
       yield if block_given?

app/controllers/application_controller.rb

@@ -156,7 +156,16 @@ class ApplicationController < ActionController::Base
       user
     end
   end
+  def try_to_autologin1
 
+      # auto-login feature starts a new session
+      user = User.try_to_autologin(params[:token])
+      if user
+          start_user_session(user)
+      end
+      user
+
+  end
   # Sets the logged in user
   def logged_user=(user)
     reset_session
@@ -248,7 +257,30 @@ class ApplicationController < ActionController::Base
       end
     end
   end
+  def authorize1(ctrl = params[:controller], action = params[:action],token = params[:token], global = false)
+
+    if(!User.current.logged? && !token.nil?)
 
+      User.current =try_to_autologin1
+    end
+    allowed  = authorize_allowed(params[:controller], params[:action],global)
+
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
+  end
+  def auth_login1(token = params[:token])
+    if(!User.current.logged? && !token.nil?)
+
+      User.current =try_to_autologin1
+    end
+  end
   def authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
     #modify by NWB
     if  @project
@@ -261,6 +293,7 @@ class ApplicationController < ActionController::Base
     allowed
   end
   def authorize_attachment_download(ctrl = params[:controller], action = params[:action], global = false)
+
     case @attachment.container_type
       when "Memo"
         allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
@@ -289,6 +322,37 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authorize_attachment_download1(ctrl = params[:controller], action = params[:action],token = params[:token], global = false)
+    if(!User.current.logged? && !token.nil?)
+      User.current = try_to_autologin1
+    end
+    case @attachment.container_type
+      when "Memo"
+        allowed = User.current.allowed_to?(:memos_attachments_download,nil,:global => true)
+      when "Message"
+        if @project
+          allowed = User.current.allowed_to?(:projects_attachments_download,@project,:global => false)
+        elsif @course
+          allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+        end
+      when "contest"
+        return true
+      when "Course"
+        allowed = User.current.allowed_to?(:course_attachments_download, @course, :global => false)
+      else
+        return true
+    end
+
+    if allowed
+      true
+    else
+      if @project && @project.archived?
+        render_403 :message => :notice_not_authorized_archived_project
+      else
+        deny_access
+      end
+    end
+  end
   def authorize_course(ctrl = params[:controller], action = params[:action], global = false)
     allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @course || @course, :global => global)
     if allowed
@@ -789,4 +853,29 @@ class ApplicationController < ActionController::Base
     @organizer = WebFooterOranizer.first
     @companies = WebFooterCompany.all
   end
+
+
+
+
+  def password_authentication
+    user, last_login_on = User.try_to_login(params[:user_name], params[:password])
+
+
+      successful_authentication(user, last_login_on)
+
+  end
+
+
+  def successful_authentication(user, last_login_on)
+    logger.info "Successful authentication for '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}"
+    # Valid user
+    self.logged_user = user
+    # generate a key and set cookie if autologin
+    if params[:autologin] && Setting.autologin?
+      set_autologin_cookie(user)
+    end
+    call_hook(:controller_account_success_authentication_after, {:user => user })
+
+
+  end
 end

app/controllers/attachments_controller.rb

@@ -17,11 +17,12 @@
 
 class AttachmentsController < ApplicationController
   layout "users_base"
+
   before_filter :find_project, :only => [:show, :download, :thumbnail, :destroy, :delete_homework]#, :except => [:upload, :autocomplete]
   before_filter :file_readable, :read_authorize, :only => [:show, :thumbnail]#Modified by young
   before_filter :delete_authorize, :only => :destroy
   before_filter :authorize_global, :only => :upload
-  before_filter :authorize_attachment_download, :only => :download
+  before_filter :authorize_attachment_download1, :only => :download
   #before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'

app/controllers/bids_controller.rb

@@ -9,6 +9,8 @@ class BidsController < ApplicationController
   menu_item :homework_statistics, :only => :homework_statistics
   menu_item :edit, :only => :edit
 
+
+
   before_filter :can_show_course,only: []
   before_filter :can_show_contest,only: []
   #Ended by young

app/controllers/courses_controller.rb

@@ -19,7 +19,7 @@ class CoursesController < ApplicationController
   before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course]
   before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create]
   before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar]
-  before_filter :toggleCourse, only: [:finishcourse, :restartcourse]
+  before_filter :toggleCourse, :only => [:finishcourse, :restartcourse]
 
   before_filter :require_login, :only => [:join, :unjoin]
   #before_filter :allow_join, :only => [:join]
@@ -809,9 +809,9 @@ class CoursesController < ApplicationController
     # modify by nwb
     # 添加私密性判断
     if User.current.member_of_course?(@course)|| User.current.admin?
-      events = @activity.events(@date_from, @date_to)
+      events = @activity.events(@days, @course.created_at)
     else
-      events = @activity.events(@date_from, @date_to, :is_public => 1)
+      events = @activity.events(@days, @course.created_at, :is_public => 1)
     end
 
     # 无新动态时，显示老动态

app/controllers/forums_controller.rb

@@ -13,6 +13,44 @@ class ForumsController < ApplicationController
   include SortHelper
 
   PageLimit = 20
+  def create_feedback
+    if User.current.logged?
+      @memo = Memo.new(params[:memo])
+      @memo.forum_id = "1"
+      @memo.author_id = User.current.id
+      #@forum = @memo.forum
+      respond_to do |format|
+        if @memo.save
+          format.html { redirect_to forum_path(@memo.forum) }
+        else
+          sort_init 'updated_at', 'desc'
+          sort_update 'created_at' => "#{Memo.table_name}.created_at",
+                      'replies' => "#{Memo.table_name}.replies_count",
+                      'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+
+          @topic_count = @forum.topics.count
+          @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+          @memos = @forum.topics.
+              reorder("#{Memo.table_name}.sticky DESC").
+              includes(:last_reply).
+              limit(@topic_pages.per_page).
+              offset(@topic_pages.offset).
+              order(sort_clause).
+              preload(:author, {:last_reply => :author}).
+              all
+
+          flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+          # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+          format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+          format.json { render json: @memo.errors, status: :unprocessable_entity }
+        end
+      end
+    else
+      respond_to do |format|
+       format.html { redirect_to signin_path }
+     end
+    end
+  end
 
   def create_memo
     @memo = Memo.new(params[:memo])
@@ -49,16 +87,15 @@ class ForumsController < ApplicationController
       end
     end
   end
-  
+
   def index
     @offset, @limit = api_offset_and_limit({:limit => 10})
     @forums_all = Forum.reorder("sticky DESC")
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
-     @forums = @forums_all.offset(@offset).limit(@limit).all
+    @forums = @forums_all.offset(@offset).limit(@limit).all
     #@forums = Forum.all
     respond_to do |format|
       format.html # index.html.erb
@@ -86,14 +123,12 @@ class ForumsController < ApplicationController
                     preload(:author, {:last_reply => :author}).
                     all
 
-
-
     # @offset, @limit = api_offset_and_limit({:limit => 10})
     # @forum = Forum.find(params[:id])
     # @memos_all = @forum.topics
     # @topic_count = @memos_all.count
     # @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     # @offset ||= @topic_pages.offset
     # @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -125,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 }
@@ -176,7 +214,6 @@ class ForumsController < ApplicationController
     @forums_count = @forums_all.count
     @forums_pages = Paginator.new @forums_count, @limit, params['page']
 
-
     @offset ||= @forums_pages.offset
     @forums = @forums_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -197,7 +234,7 @@ class ForumsController < ApplicationController
     @memos_all = @forum.topics.where("subject LIKE ?", q)
     @topic_count = @memos_all.count
     @topic_pages = Paginator.new @topic_count, @limit, params['page']
-    
+
     @offset ||= @topic_pages.offset
     @memos = @memos_all.offset(@offset).limit(@limit).all
     respond_to do |format|
@@ -205,20 +242,17 @@ class ForumsController < ApplicationController
         render 'show', :layout => 'base_forums'
       }
       format.json { render json: @forum }
-    end 
+    end
   end
 
-
-
   private
 
-
   def find_forum_if_available
     @forum = Forum.find(params[:id]) if params[:id]
   rescue ActiveRecord::RecordNotFound
     render_404
     nil
-  end
+    end
 
   def authenticate_user_edit
     find_forum_if_available

app/controllers/homework_attach_controller.rb

@@ -26,6 +26,7 @@ class HomeworkAttachController < ApplicationController
     get_not_batch_homework_list sort,direction, @bid.id
     @cur_page = params[:page] || 1
     @cur_type = 1
+    @cur_sort,@cur_direction =  params[:sort] || "s_socre", params[:direction] || "desc"
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
       format.js
@@ -433,7 +434,7 @@ class HomeworkAttachController < ApplicationController
   #添加留言
   def addjours
     @is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
-    @cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
+    @cur_page,@cur_type = params[:page] || 1,params[:cur_type] || 5
     @homework = HomeworkAttach.find(params[:homework_id])
     @stars_reates = @homework.rates(:quality)
     homework = @homework
@@ -479,7 +480,7 @@ class HomeworkAttachController < ApplicationController
 
     if @cur_type == "1" #如果当前是老师未批列表，需要刷新整个作业列表界面
       @bid = @homework.bid
-      get_not_batch_homework_list "s_socre","desc",@homework.bid_id
+      get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
             (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,

app/controllers/issues_controller.rb

@@ -19,10 +19,13 @@ class IssuesController < ApplicationController
   layout 'base_projects'#Added by young
   default_search_scope :issues
 
+  before_filter :authorize1, :only => [:show]
   before_filter :find_issue, :only => [:show, :edit, :update]
   before_filter :find_issues, :only => [:bulk_edit, :bulk_update, :destroy]
   before_filter :find_project, :only => [:new, :create, :update_form]
+  #before_filter :authorize, :except => [:index, :show]
   before_filter :authorize, :except => [:index]
+
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
   before_filter :build_new_issue_from_params, :only => [:new, :create, :update_form]
@@ -107,7 +110,7 @@ class IssuesController < ApplicationController
   end
 
   def show
-    
+
     @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)

app/controllers/my_controller.rb

@@ -17,6 +17,9 @@
 
 class MyController < ApplicationController
   layout "users_base"
+  # edit
+  before_filter :auth_login1, :only => [:account]
+  #
   before_filter :require_login
 
   helper :issues
@@ -150,6 +153,7 @@ class MyController < ApplicationController
         File.delete(diskfile1)
       end
     end
+
   end
 
   # Destroys user's account

app/controllers/users_controller.rb

@@ -15,8 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 class UsersController < ApplicationController
+
   layout :setting_layout
   #Added by young
+  before_filter :auth_login1, :only => [:show, :user_activities]
   menu_item :activity
   menu_item :user_information, :only => :info
   menu_item :user_course, :only => :user_courses
@@ -29,6 +31,9 @@ class UsersController < ApplicationController
  
   #Ended by young
 
+  # edit
+
+  #
   before_filter :can_show_course, :only => [:user_courses,:user_homeworks]
   before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
@@ -41,7 +46,7 @@ class UsersController < ApplicationController
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index]
   before_filter :auth_user_extension, only: :show
-  before_filter :rest_user_score, only: :show
+  #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
   accept_api_auth :index, :show, :create, :update, :destroy,:tag_save  , :tag_saveEx
   
@@ -129,7 +134,7 @@ class UsersController < ApplicationController
   end
 
   def show_new_score
-    render :layout => false
+    render :layout => 'users_base'
   end
 # end
 
@@ -188,9 +193,9 @@ class UsersController < ApplicationController
     for user in @watcher
       events << Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 30)
     end
-    
-    
-    
+
+
+
     @events_by_day = events.group_by(&:event_date)
 
     unless User.current.admin?

app/controllers/zipdown_controller.rb

@@ -7,17 +7,6 @@ class ZipdownController < ApplicationController
   SAVE_FOLDER = "#{Rails.root}/files"
   OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip"
 
-  #通过作业Id找到项目（课程）
-  def find_project_by_bid_id
-    obj_class = params[:obj_class]
-    obj_id = params[:obj_id]
-    obj = obj_class.constantize.find(obj_id)
-    case obj.class.to_s.to_sym
-      when :Bid
-        @project = obj.courses[0]
-    end
-  end
-
   def assort
     if params[:obj_class] == "Bid"
       bid = Bid.find params[:obj_id]
@@ -33,8 +22,8 @@ class ZipdownController < ApplicationController
     end
     send_file zipfile, :filename => bid.name + ".zip", :type => detect_content_type(zipfile) if zipfile
 
-  rescue Exception => e
-    render file: 'public/no_file_found.html'
+  #rescue Exception => e
+  #  render file: 'public/no_file_found.html'
   end
 
   #下载某一学生的作业的所有文件
@@ -56,12 +45,23 @@ class ZipdownController < ApplicationController
     else
       render_403
     end
-  rescue => e
-    render file: 'public/file_not_found.html'
+  #rescue => e
+  #  render file: 'public/file_not_found.html'
   end
 
   private
 
+  #通过作业Id找到项目（课程）
+  def find_project_by_bid_id
+    obj_class = params[:obj_class]
+    obj_id = params[:obj_id]
+    obj = obj_class.constantize.find(obj_id)
+    case obj.class.to_s.to_sym
+      when :Bid
+        @project = obj.courses[0]
+    end
+  end
+
   def zip_bid(bid)
     # Todo: User Access Controll
     bid_homework_path = []
@@ -75,16 +75,21 @@ class ZipdownController < ApplicationController
 
   def zip_homework_by_user(homeattach)
     homeworks_attach_path = []
+    not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
     # 并且返回zip路径
     homeattach.attachments.each do |attach|
-      homeworks_attach_path << attach.diskfile#.to_s.slice((length+1)..-1)
+      if File.exist?(attach.diskfile)
+        homeworks_attach_path << attach.diskfile
+      else
+        not_exist_file << attach.filename
+      end
     end
-    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true)
+    zipping("#{homeattach.user.lastname}#{homeattach.user.firstname}_#{((homeattach.user.user_extensions.nil? || homeattach.user.user_extensions.student_id.nil?) ? "" : homeattach.user.user_extensions.student_id)}_#{Time.now.to_i.to_s}.zip", homeworks_attach_path, OUTPUT_FOLDER, true, not_exist_file)
   end
 
 
-  def zipping(zip_name_refer, files_paths, output_path, is_attachment=false)
+  def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
     # 输入待打包的文件列表，已经打包文件定位到ouput_path
     ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE')
     input_filename = files_paths
@@ -96,19 +101,31 @@ class ZipdownController < ApplicationController
 
     Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
       input_filename.each do |filename|
+        flag = true
+        index = 1
         rename_file = ic.iconv( (File.basename(filename)) ).to_s
         rename_file = ic.iconv( filename_to_real( File.basename(filename))).to_s if is_attachment
 
-        zipfile.add(rename_file, filename)
+        begin
+          zipfile.add(rename_file, filename)
+          flag = false
+        rescue Exception => e
+          zipfile.get_output_stream('FILE_NOTICE.txt') do |os|
+            os.write l(:label_file_exist)
+          end
+          next
+        end
+      end
+      unless not_exist_file.empty?
+        zipfile.get_output_stream('FILE_LOST.txt') do |os|
+          os.write l(:label_file_lost) + not_exist_file.join(',').to_s
+        end
       end
-      #zipfile.get_output_stream('ReadMe') do |os|
-      #  os.write 'Homeworks'
-      #end
     end
     zipfile_name
-  rescue Errno => e
-    logger.error "[zipdown#zipping] ===> #{e}"
-    @error = e
+  #rescue Errno => e
+  #  logger.error "[zipdown#zipping] ===> #{e}"
+  #  @error = e
   end
   def detect_content_type(name)
     content_type = Redmine::MimeType.of(name)
@@ -119,4 +136,4 @@ class ZipdownController < ApplicationController
     attach = Attachment.find_by_disk_filename(name)
     attach.filename
   end
-end
+end

app/helpers/application_helper.rb

@@ -140,10 +140,12 @@ module ApplicationHelper
   # * :text - Link text (default to attachment filename)
   # * :download - Force download (default: false)
   def link_to_attachment(attachment, options={})
+    token = options[:token] if options[:token]
     text = options.delete(:text) || attachment.filename
     route_method = options.delete(:download) ? :download_named_attachment_path : :named_attachment_path
     html_options = options.slice!(:only_path)
     url = send(route_method, attachment, attachment.filename, options)
+     url << "?token=#{token}" unless token.nil?
     link_to text, url, html_options
   end
 
@@ -1593,6 +1595,12 @@ module ApplicationHelper
     end
     s
   end
+  
+  def get_memo
+    @new_memo = Memo.new
+    #@new_memo.subject = "有什么想说的，尽管来咆哮吧~~"
+    @public_forum = Forum.find(1)
+  end
 
   private
 

app/helpers/courses_helper.rb

@@ -20,7 +20,7 @@ module CoursesHelper
 
   # 返回教师数量，即roles表中定义的Manager
   def teacherCount project
-    searchTeacherAndAssistant(project).count
+    project.members.count - studentCount(project).to_i
     # or
     # searchTeacherAndAssistant(project).count
   end
@@ -111,10 +111,14 @@ module CoursesHelper
     #garble count
  # end
 
+  #获取课程所有成员
+  def course_all_member course
+    course.members
+  end
   # 学生人数计算
   # add by nwb
   def studentCount course
-    searchStudent(course).count.to_s#course.student.count
+    course.student.count.to_s#course.student.count
   end
 
   #课程成员数计算
@@ -561,12 +565,13 @@ module CoursesHelper
   def course_in_current_or_next_term course
     is_current_term = false
     is_next_term = false
-    if course.time == Time.now.year && course.term == cur_course_term
+    year_now = Time.now.month < 3 ? Time.now.year - 1:Time.now.year
+    if course.time == year_now && course.term == cur_course_term
       is_current_term = true
     end
-    if cur_course_term == "秋季学期" && course.time == (Time.now.year + 1) && course.term == "春季学期"
+    if cur_course_term == "秋季学期" && course.time == (year_now + 1) && course.term == "春季学期"
       is_next_term = true
-    elsif cur_course_term == "春季学期" && course.time == Time.now.year && course.term == "秋季学期"
+    elsif cur_course_term == "春季学期" && course.time == year_now && course.term == "秋季学期"
       is_next_term = true
     end
     is_current_term || is_next_term

app/helpers/issues_helper.rb

@@ -224,6 +224,7 @@ module IssuesHelper
   # as an array of strings
   def details_to_strings(details, no_html=false, options={})
     options[:only_path] = (options[:only_path] == false ? false : true)
+    options[:token] = options[:token] if options[:token]
     strings = []
     values_by_field = {}
     details.each do |detail|
@@ -312,7 +313,11 @@ module IssuesHelper
       old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank?
       if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+        if options[:token].nil?
+          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+        else
+          value = link_to_attachment(atta, :download => true, :only_path => options[:only_path], :token => options[:token])
+        end
         if options[:only_path] != false && atta.is_text?
           value += link_to(
                        image_tag('magnifier.png'),

app/helpers/poll_helper.rb

@@ -0,0 +1,77 @@
+# encoding: utf-8
+#
+# Redmine - project management software
+# Copyright (C) 2006-2013  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+module PollHelper
+  #判断选项是否被选中
+  def answer_be_selected?(answer,user)
+     pv = answer.poll_votes.where("#{PollVote.table_name}.user_id = #{user.id} ")
+    if !pv.nil? && pv.count > 0
+      true
+    else
+      false
+    end
+  end
+  
+  #获取文本题答案
+  def get_anwser_vote_text(question_id,user_id)
+    pv = PollVote.find_by_poll_question_id_and_user_id(question_id,user_id)
+    if pv.nil?
+      ''
+    else
+      pv.vote_text
+    end
+  end
+
+  #判断用户是否已经提交了问卷
+  def has_commit_poll?(poll_id,user_id)
+    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
+    if pu.nil?
+      false
+    else
+      true
+    end
+  end
+  
+  #统计答题百分比，统计结果保留两位小数
+  def statistics_result_percentage(e, t)
+    e = e.to_f
+    t = t.to_f
+    t == 0 ? 0 : format("%.2f", e*100/t)
+  end
+  
+  #多选的时候查询去重
+  def total_answer id
+    total = PollVote.find_by_sql("SELECT distinct(user_id) FROM `poll_votes` where poll_question_id = #{id}").count
+  end
+  
+  #页面体型显示
+  def options_show pq
+    case pq
+    when 1
+      "单选题"
+    when 2
+      "多选题"
+    when 3
+      "单行主观题"
+    else
+      "多行主观题"
+    end
+  end
+
+end

app/models/contest.rb

@@ -15,7 +15,8 @@ class Contest < ActiveRecord::Base
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
   has_many :contestnotifications, :dependent => :destroy, :include => :author
 
-  
+
+
 
   acts_as_attachable
 

app/models/course.rb

@@ -38,7 +38,7 @@ class Course < ActiveRecord::Base
 
   validates_presence_of :password, :term,:name
   validates_format_of  :class_period, :with =>/^[1-9]\d*$/
-  validates_format_of  :name,:with =>/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/
+  validates_format_of  :name,:with =>/^[^ ]+[a-zA-Z0-9_\u4e00-\u9fa5\s\S]+$/
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
   after_create :create_board_sync

app/models/forum.rb

@@ -23,7 +23,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
@@ -38,6 +38,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

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

app/models/issue_observer.rb

@@ -18,8 +18,12 @@
 class IssueObserver < ActiveRecord::Observer
  
   def after_create(issue)
-    thread1=Thread.new do
-       Mailer.issue_add(issue).deliver if Setting.notified_events.include?('issue_added')
-    end 
+    Thread.start do
+      recipients = issue.recipients
+      recipients.each do |rec|
+        Mailer.issue_add(issue,rec).deliver if Setting.notified_events.include?('issue_added')
+      end
+    end
+
   end
 end

app/models/issue_overdue.rb

@@ -20,7 +20,11 @@ class IssueOverdue < ActiveRecord::Base
             #发邮件
             #puts "11" + issue.id.to_s
             #Mailer.issue_expire(issue).deliver
-            Mailer.issue_add(issue).deliver
+            recipients = issue.recipients
+            recipients.each do |rec|
+
+              Mailer.issue_edit(issue,rec).deliver
+            end
             break
           end
         end