Merge branch 'szzh' into develop

Gemfile

@@ -4,10 +4,11 @@ source 'http://ruby.taobao.org'
 unless RUBY_PLATFORM =~ /w32/
   # unix-like only
   gem 'iconv'
-  gem 'rubyzip'
-  gem 'zip-zip'
 end
 
+gem 'rubyzip'
+gem 'delayed_job_active_record'#, :group => :production
+gem 'daemons'
 gem 'grape', '~> 0.9.0'
 gem 'grape-entity'
 gem 'seems_rateable', '~> 1.0.13'

app/api/mobile/api.rb

@@ -41,7 +41,7 @@ module Mobile
     mount Apis::Comments
 
     #add_swagger_documentation ({api_version: 'v1', base_path: 'http://u06.shellinfo.cn/trustie/api'})
-     #add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
+    add_swagger_documentation ({api_version: 'v1', base_path: '/api'})  if Rails.env.development?
 
   end
 end

app/controllers/account_controller.rb

@@ -88,9 +88,7 @@ class AccountController < ApplicationController
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
-          Thread.new do
-            Mailer.lost_password(token).deliver
-          end
+            Mailer.run.lost_password(token)
             flash[:notice] = l(:notice_account_lost_email_sent)
             redirect_to signin_url
           return                      
@@ -228,7 +226,7 @@ class AccountController < ApplicationController
     user = User.find(params[:user]) if params[:user]
     token = Token.new(:user => user, :action => "register")
     if token.save
-      Mailer.register(token).deliver
+      Mailer.run.register(token)
 
     else
       yield if block_given?
@@ -366,7 +364,7 @@ class AccountController < ApplicationController
     token = Token.new(:user => user, :action => "register")
     if user.save and token.save
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
-      Mailer.register(token).deliver
+      Mailer.run.register(token)
 
 
       flash[:notice] = l(:notice_account_register_done)
@@ -401,7 +399,7 @@ class AccountController < ApplicationController
     if user.save
       UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)
       # Sends an email to the administrators
-      Mailer.account_activation_request(user).deliver
+      Mailer.run.account_activation_request(user)
       account_pending
     else
       yield if block_given?

app/controllers/applied_project_controller.rb

@@ -13,7 +13,7 @@ class AppliedProjectController < ApplicationController
           @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
           if  @applieds.count == 0
             appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-            Mailer.applied_project(appliedproject).deliver
+            Mailer.run.applied_project(appliedproject)
             @status = 2
           else
             @status = 1
@@ -31,7 +31,7 @@ class AppliedProjectController < ApplicationController
     @applieds = AppliedProject.where("user_id = ? and project_id = ?", params[:user_id],params[:project_id])
     if  @applieds.count == 0
       appliedproject = AppliedProject.create(:user_id => params[:user_id], :project_id => params[:project_id])
-      Mailer.applied_project(appliedproject).deliver
+      Mailer.run.applied_project(appliedproject)
     end
 
     #redirect_to project_path(params[:project_id])

app/controllers/attachments_controller.rb

@@ -27,7 +27,7 @@ class AttachmentsController < ApplicationController
   accept_api_auth :show, :download, :upload
   require 'iconv'
   include AttachmentsHelper
-
+  include ApplicationHelper
 
   def show
     respond_to do |format|
@@ -65,36 +65,7 @@ class AttachmentsController < ApplicationController
   def download
     # modify by nwb
     # 下载添加权限设置
-     candown = false
-    if @attachment.container.class.to_s != "HomeworkAttach" && (@attachment.container.has_attribute?(:project) || @attachment.container.has_attribute?(:project_id)) && @attachment.container.project
-      project = @attachment.container.project
-      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif  @attachment.container.is_a?(Project)
-      project = @attachment.container
-      candown= User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
-        @attachment.container.board.project
-      project = @attachment.container.board.project
-      candown = User.current.member_of?(project) || (project.is_public && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:course) ||@attachment.container.has_attribute?(:course_id) ) && @attachment.container.course
-      course = @attachment.container.course
-      candown = User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif @attachment.container.is_a?(Course)
-      course = @attachment.container
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif (@attachment.container.has_attribute?(:board) || @attachment.container.has_attribute?(:board_id)) && @attachment.container.board &&
-        @attachment.container.board.course
-      course = @attachment.container.board.course
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && @attachment.is_public == 1)
-    elsif @attachment.container.class.to_s=="HomeworkAttach" && @attachment.container.bid.reward_type == 3
-      candown = true
-    elsif  @attachment.container_type == "Bid" && @attachment.container && @attachment.container.courses.first
-      course = @attachment.container.courses.first
-      candown = User.current.member_of_course?(course) || (course.is_public == 1 && @attachment.is_public == 1)
-    else
-
-      candown = @attachment.is_public == 1
-    end
+     candown = attachment_candown @attachment
     if candown || User.current.admin? || User.current.id == @attachment.author_id
       @attachment.increment_download
       if stale?(:etag => @attachment.digest)
@@ -349,6 +320,46 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  def add_exist_file_to_projects
+    file = Attachment.find(params[:file_id])
+    projects = params[:projects][:project]
+    @message = ""
+    projects.each do |project|
+      c = Project.find(project);
+      if project_contains_attachment?(c,file)
+        if @message && @message == ""
+          @message += l(:label_project_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        else
+          @message +=  "<br/>" + l(:label_project_prompt) + c.name + l(:label_contain_resource) + file.filename + l(:label_quote_resource_failed)
+          next
+        end
+      end
+      attach_copied_obj = file.copy
+      attach_copied_obj.tag_list.add(file.tag_list) # tag关联
+      attach_copied_obj.container = c
+      attach_copied_obj.created_on = Time.now
+      attach_copied_obj.author_id = User.current.id
+      attach_copied_obj.copy_from = file.copy_from.nil? ? file.id : file.copy_from
+      if attach_copied_obj.attachtype == nil
+        attach_copied_obj.attachtype = 4
+      end
+      @obj = c
+      @save_flag = attach_copied_obj.save
+      @save_message = attach_copied_obj.errors.full_messages
+      update_quotes attach_copied_obj
+    end
+    respond_to do |format|
+      format.js
+    end
+  rescue NoMethodError
+    @save_flag = false
+    @save_message = [] << l(:label_course_empty_select)
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def add_exist_file_to_courses
     file = Attachment.find(params[:file_id])
     courses = params[:courses][:course]

app/controllers/comments_controller.rb

@@ -17,6 +17,7 @@
 
 class CommentsController < ApplicationController
   default_search_scope :news
+  include ApplicationHelper
   model_object News
   before_filter :find_model_object 
   before_filter :find_project_from_association
@@ -26,9 +27,11 @@ class CommentsController < ApplicationController
     raise Unauthorized unless @news.commentable?
 
     @comment = Comment.new
-    @comment.safe_attributes = params[:comment]
+    @comment.comments = params[:comment]
     @comment.author = User.current
     if @news.comments << @comment
+      ids = params[:asset_id].split(',')
+      update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
       flash[:notice] = l(:label_comment_added)
     end
 

app/controllers/courses_controller.rb

@@ -1,6 +1,7 @@
 class CoursesController < ApplicationController
   layout 'base_courses'
   include CoursesHelper
+  include ActivitiesHelper
   helper :activities
   helper :members
   helper :words
@@ -680,26 +681,49 @@ class CoursesController < ApplicationController
         "show_course_files" => true,
         "show_course_news" => true,
         "show_course_messages" => true,
-        "show_bids" => true,
         "show_course_journals_for_messages" => true,
+        "show_bids" => true,
         "show_homeworks" => true
     }
     @date_to ||= Date.today + 1
     @date_from = (@date_to - @days) > @course.created_at.to_date ? (@date_to - @days) : @course.created_at.to_date
     @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
-    @author ||= @course.teacher
-    # 决定显示所用用户或单个用户活动
-    @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
-                                               :with_subprojects => false,
-                                               :author => @author)
-    @activity.scope_select {|t| has["show_#{t}"]}
-    # modify by nwb
-    # 添加私密性判断
-    if User.current.member_of_course?(@course)|| User.current.admin?
-      events = @activity.events(@days, @course.created_at)
+    if @author.nil?
+      # 显示老师和助教的活动
+      # @authors = searchTeacherAndAssistant(@course)
+      @authors = course_all_member(@course)
+      events = []
+      @authors.each do |author|
+        @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
+                                                   :with_subprojects => false,
+                                                   :author => author.user)
+
+        @activity.scope_select {|t| has["show_#{t}"]}
+        # modify by nwb
+        # 添加私密性判断
+        if User.current.member_of_course?(@course)|| User.current.admin?
+          events += @activity.events(@days, @course.created_at)
+        else
+          events += @activity.events(@days, @course.created_at, :is_public => 1)
+        end
+
+      end
     else
-      events = @activity.events(@days, @course.created_at, :is_public => 1)
+    # @author = @course.teacher
+      @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
+                                                 :with_subprojects => false,
+                                                 :author => @author)
+
+      @activity.scope_select {|t| has["show_#{t}"]}
+      # modify by nwb
+      # 添加私密性判断
+      if User.current.member_of_course?(@course)|| User.current.admin?
+        events = @activity.events(@days, @course.created_at)
+      else
+        events = @activity.events(@days, @course.created_at, :is_public => 1)
+      end
     end
+
     # 无新动态时，显示老动态
     if events.count == 0
       if User.current.member_of_course?(@course)|| User.current.admin?
@@ -708,13 +732,17 @@ class CoursesController < ApplicationController
         events = @activity.events(:is_public => 1)
       end
     end
-    events = paginateHelper events,10
-    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
-    #  documents
     @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
     if(User.find_by_id(CourseInfos.find_by_course_id(@course.id).try(:user_id)))
       @user = User.find_by_id(CourseInfos.find_by_course_id(@course.id).user_id)
     end
+
+    sorted_events = sort_activity_events_course(events);
+    events = paginateHelper sorted_events,10
+    @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
+    #  documents
+
+
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
       format.api

app/controllers/documents_controller.rb

@@ -110,7 +110,7 @@ class DocumentsController < ApplicationController
     render_attachment_warning_if_needed(@document)
 
     if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
-      Mailer.attachments_added(attachments[:files]).deliver
+      Mailer.run.attachments_added(attachments[:files])
     end
     redirect_to document_url(@document)
   end

app/controllers/files_controller.rb

@@ -23,13 +23,14 @@ class FilesController < ApplicationController
   before_filter :auth_login1, :only => [:index]
   before_filter :logged_user_by_apptoken,:only => [:index]
   before_filter :find_project_by_project_id#, :except => [:getattachtype]
-  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search]
+  before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search,:search_project,:quote_resource_show_project]
 
   helper :sort
   include SortHelper
   include FilesHelper
   helper :project_score
   include CoursesHelper
+  include ApplicationHelper
 
   def show_attachments obj
     @attachments = []
@@ -41,8 +42,8 @@ class FilesController < ApplicationController
     @feedback_count = @all_attachments.count
     @feedback_pages = Paginator.new @feedback_count, @limit, params['page']
     @offset ||= @feedback_pages.offset
-    @curse_attachments_all = @all_attachments[@offset, @limit]
-    @curse_attachments = paginateHelper @all_attachments,10
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @obj_attachments = paginateHelper @all_attachments,10
   end
 
   def search
@@ -78,6 +79,39 @@ class FilesController < ApplicationController
     end
   end
 
+  def search_project
+    sort = ""
+    @sort = ""
+    @order = ""
+    @is_remote = true
+    if params[:sort]
+      order_by = params[:sort].split(":")
+      @sort = order_by[0]
+      if order_by.count > 1
+        @order = order_by[1]
+      end
+      sort = "#{@sort} #{@order}"
+    end
+
+    begin
+      q = "%#{params[:name].strip}%"
+      #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+      if params[:insite]
+        @result = find_public_attache q,sort
+        @result = visable_attachemnts_insite @result,@project
+        @searched_attach = paginateHelper @result,10
+      else
+        @result = find_project_attache q,@project,sort
+        @result = visable_attachemnts @result
+        @searched_attach = paginateHelper @result,10
+      end
+
+      #rescue Exception => e
+      #  #render 'stores'
+      #  redirect_to search_course_files_url
+    end
+  end
+
   def find_course_attache keywords,course,sort = ""
     if sort == ""
       sort =  "created_on DESC"
@@ -87,6 +121,26 @@ class FilesController < ApplicationController
     #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
   end
 
+  def find_project_attache keywords,project,sort = ""
+    if sort == ""
+      sort =  "created_on DESC"
+    end
+    ids = ""
+    len = 0
+    count = project.versions.count
+    project.versions.each do |version|
+      len = len + 1
+      if len != count
+        ids += version.id.to_s + ','
+      else
+        ids += version.id.to_s
+      end
+    end
+    resultSet = Attachment.where("((attachments.container_type = 'Project' And attachments.container_id = '#{project.id}') OR (container_type = 'Version' AND container_id IN (#{ids}))) AND filename LIKE :like ", like: "%#{keywords}%").
+       reorder(sort)
+    #resultSet = Attachment.find_by_sql("SELECT `attachments`.* FROM `attachments` LEFT OUTER JOIN `homework_attaches` ON `attachments`.container_type = 'HomeworkAttach' AND `attachments`.container_id = `homework_attaches`.id LEFT OUTER JOIN `homework_for_courses` ON `homework_attaches`.bid_id = `homework_for_courses`.bid_id LEFT OUTER JOIN `homework_for_courses` AS H_C ON `attachments`.container_type = 'Bid' AND `attachments`.container_id = H_C.bid_id WHERE (`homework_for_courses`.course_id = 117 OR H_C.course_id = 117 OR (`attachments`.container_type = 'Course' AND `attachments`.container_id = 117)) AND `attachments`.filename LIKE '%#{keywords}%'").reorder("created_on DESC")
+  end
+
   def find_public_attache keywords,sort = ""
     # StoresController#search 将每条文件都查出来，再次进行判断过滤。---> resultSet.to_a.map
     # 此时内容不多速度还可，但文件增长，每条判断多则进行3-4次表连接。
@@ -132,17 +186,27 @@ class FilesController < ApplicationController
               attribute = "downloads"
             when "created_on"
               attribute = "created_on"
+            when "quotes"
+              attribute = "quotes"
+            else
+              attribute = "created_on"
           end
-
-          if order_by.count == 1
-            sort += "#{Attachment.table_name}.#{attribute} asc " if attribute
-          elsif order_by.count == 2
-            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} " if attribute && order_by[1]
-          end
-          if sort_type != params[:sort].split(",").last
-            sort += ","
+          @sort = order_by[0]
+          @order = order_by[1]
+          if order_by.count == 1 && attribute
+            sort += "#{Attachment.table_name}.#{attribute} asc "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
+          elsif order_by.count == 2 && order_by[1]
+            sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
+            if sort_type != params[:sort].split(",").last
+              sort += ","
+            end
           end
         end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
       end
 
       @containers = [ Project.includes(:attachments).find(@project.id)]
@@ -184,6 +248,8 @@ class FilesController < ApplicationController
               attribute = "created_on"
             when "quotes"
               attribute = "quotes"
+            else
+            attribute = "created_on"
           end
           @sort = order_by[0]
           @order = order_by[1]
@@ -199,6 +265,8 @@ class FilesController < ApplicationController
             end
           end
         end
+      else
+        sort = "#{Attachment.table_name}.created_on desc"
       end
 
       @containers = [ Course.includes(:attachments).reorder(sort).find(@course.id)]
@@ -215,6 +283,11 @@ class FilesController < ApplicationController
     @can_quote = attachment_candown @file
   end
 
+  def quote_resource_show_project
+    @file = Attachment.find(params[:id])
+    @can_quote = attachment_candown @file
+  end
+
   def new
     @versions = @project.versions.sort
     @course_tag = @project.project_type
@@ -241,7 +314,7 @@ class FilesController < ApplicationController
        render_attachment_warning_if_needed(container)
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-         Mailer.attachments_added(attachments[:files]).deliver
+         Mailer.run.attachments_added(attachments[:files])
        end
 
        # TODO: 临时用 nyan
@@ -270,7 +343,7 @@ class FilesController < ApplicationController
        attachments = Attachment.attach_filesex(@course, params[:attachments], params[:attachment_type])
 
        if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-         Mailer.attachments_added(attachments[:files]).deliver
+         Mailer.run.attachments_added(attachments[:files])
        end
 
        # TODO: 临时用 nyan

app/controllers/forums_controller.rb

@@ -64,7 +64,7 @@ class ForumsController < ApplicationController
     respond_to do |format|
       if @memo.save
         ids = params[:asset_id].split(',')
-        update_kindeditor_assets_owner ids ,@memo.id,1
+        update_kindeditor_assets_owner ids ,@memo.id,OwnerTypeHelper::MEMO
         #end
         format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
         format.json { render json: @memo, status: :created, location: @memo }
@@ -171,7 +171,7 @@ class ForumsController < ApplicationController
       # Description after save后需要进行资源记录的更新
       # owner_type = 2 对应的是 forum
       ids = params[:asset_id].split(',')
-      update_kindeditor_assets_owner ids ,@forum.id,2
+      update_kindeditor_assets_owner ids ,@forum.id,OwnerTypeHelper::FORUM
       #end
       respond_to do |format|
 

app/controllers/messages_controller.rb

@@ -86,6 +86,10 @@ class MessagesController < ApplicationController
     if request.post?
       @message.save_attachments(params[:attachments])
       if @message.save
+        # 更新kindeditor上传的图片资源所有者
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE
+
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
         redirect_to board_message_url(@board, @message)
@@ -117,6 +121,8 @@ class MessagesController < ApplicationController
     @topic.children << @reply
     #@topic.update_attribute(:updated_on, Time.now)
     if !@reply.new_record?
+      ids = params[:asset_id].split(',')
+      update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE
       call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attachments = Attachment.attach_files(@reply, params[:attachments])
       render_attachment_warning_if_needed(@reply)

app/controllers/news_controller.rb

@@ -17,6 +17,7 @@
 
 class NewsController < ApplicationController
   layout 'base_projects'# by young
+  include ApplicationHelper
   before_filter :authorize1, :only => [:show]
   default_search_scope :news
   model_object News
@@ -136,6 +137,8 @@ class NewsController < ApplicationController
       @news.safe_attributes = params[:news]
       @news.save_attachments(params[:attachments])
       if @news.save
+        ids = params[:asset_id].split(',')
+        update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
         render_attachment_warning_if_needed(@news)
         flash[:notice] = l(:notice_successful_create)
         redirect_to course_news_index_url(@course)

app/controllers/projects_controller.rb

@@ -336,7 +336,7 @@ class ProjectsController < ApplicationController
   def send_mail_to_member
     if !params[:mail].blank? && User.find_by_mail(params[:mail].to_s).nil?
       email = params[:mail]
-      Mailer.send_invite_in_project(email, @project, User.current).deliver
+      Mailer.run.send_invite_in_project(email, @project, User.current)
       @is_zhuce =false
       flash[:notice] = l(:notice_email_sent, :value => email)
     else

app/controllers/repositories_controller.rb

@@ -131,7 +131,7 @@ update
       @project_path=@root_path+"htdocs/"+@repository_name
       @repository_tag=params[:repository][:upassword] || params[:repository][:password]
       @repo_name=User.current.login.to_s+"_"+params[:repository][:identifier]
-      logger.info "htpasswd -mb "+@root_path+"user.passwd "+@repo_name+": "+@repository_tag
+      logger.info "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+": "+@repository_tag
       logger.info "the value of create repository"+@root_path+": "+@repository_name+": "+@project_path+": "+@repo_name
       attrs = pickup_extra_info
       if((@repository_tag!="")&&params[:repository_scm]=="Git")
@@ -147,9 +147,9 @@ update
       @repository.project = @project
       if request.post? && @repository.save
         if(params[:repository_scm]=="Git")
-          system "htpasswd -mb "+@root_path+"user.passwd "+@repo_name+" "+@repository_tag
+          system "htpasswd -mb "+@root_path+"htdocs/user.passwd "+@repo_name+" "+@repository_tag
           system "echo -e '"+@repo_name+"-write:"+
-                     " "+@repo_name+"'  >> "+@root_path+"group.passwd"
+                     " "+@repo_name+"'  >> "+@root_path+"htdocs/group.passwd"
           system "mkdir "+@root_path+"htdocs/"+User.current.login.to_s
           system "git init --bare "+@project_path
           system "mv "+@project_path+"/hooks/post-update{.sample,}"
@@ -243,8 +243,8 @@ update
     if(@repository.type=="Repository::Git")  
       logger.info "destory the repository value"+"root path"+@root_path+"repo_name"+@repo_name+
       "repository_name"+@repository_name+"user group"+@middle    
-        system "sed -i /"+@repo_name+"/{d} "+@root_path+"user.passwd"
-        system "sed -i /"+@middle+"/{d} "+@root_path+"group.passwd"
+        system "sed -i /"+@repo_name+"/{d} "+@root_path+"htdocs/user.passwd"
+        system "sed -i /"+@middle+"/{d} "+@root_path+"htdocs/group.passwd"
         system "rm -r "+@root_path+"htdocs/"+@repository_name
         # if(@sed_user&&@sed_group&&@remove)
         # else

app/controllers/users_controller.rb

@@ -553,7 +553,7 @@ class UsersController < ApplicationController
       @user.pref.save
       @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
 
-      Mailer.account_information(@user, params[:user][:password]).deliver if params[:send_information]
+      Mailer.run.account_information(@user, params[:user][:password]) if params[:send_information]
 
       respond_to do |format|
         format.html {
@@ -620,9 +620,9 @@ class UsersController < ApplicationController
       @user.notified_project_ids = (@user.mail_notification == 'selected' ? params[:notified_project_ids] : [])
 
       if was_activated
-        Mailer.account_activated(@user).deliver
+        Mailer.run.account_activated(@user)
       elsif @user.active? && params[:send_information] && !params[:user][:password].blank? && @user.auth_source_id.nil?
-        Mailer.account_information(@user, params[:user][:password]).deliver
+        Mailer.run.account_information(@user, params[:user][:password])
       end
 
       respond_to do |format|

app/controllers/words_controller.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #####leave message   fq
 class WordsController < ApplicationController
-  
+  include ApplicationHelper
   before_filter :find_user, :only => [:new, :create, :destroy, :more, :back]
   def create
     if params[:new_form][:user_message].size>0
@@ -209,6 +209,8 @@ class WordsController < ApplicationController
     message = params[:new_form][:course_message]
     feedback = Course.add_new_jour(user, message, params[:id])
     if(feedback.errors.empty?)
+      ids = params[:asset_id].split(',')
+      update_kindeditor_assets_owner ids,feedback[:id],OwnerTypeHelper::JOURNALSFORMESSAGE
       redirect_to course_feedback_url(params[:id]), notice: l(:label_feedback_success)
     else
       flash[:error] = feedback.errors.full_messages[0]

app/controllers/zipdown_controller.rb

@@ -5,7 +5,7 @@ class ZipdownController < ApplicationController
   #检查权限
   #勿删 before_filter :authorize, :only => [:assort,:download_user_homework]
   SAVE_FOLDER = "#{Rails.root}/files"
-  OUTPUT_FOLDER = "#{Rails.root}/tmp/archiveZip"
+  OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
 
   #统一下载功能
   def download
@@ -16,9 +16,11 @@ class ZipdownController < ApplicationController
     end
   end
 
+  #一个作业下所有文件打包下载，只有admin和课程老师有权限
   def assort
     if params[:obj_class] == "Bid"
       bid = Bid.find params[:obj_id]
+      render_403 if User.current.allowed_to?(:as_teacher,bid.courses.first)
       file_count = 0
       bid.homeworks.map { |homework| file_count += homework.attachments.count}
       if file_count > 0
@@ -56,9 +58,9 @@ class ZipdownController < ApplicationController
       if homework != nil
         unless homework.attachments.empty?
           zipfile = zip_homework_by_user homework
-          send_file zipfile, :filename =>  ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
+          send_file zipfile.file_path, :filename =>  ((homework.user.user_extensions.nil? || homework.user.user_extensions.student_id.nil?) ? "" : homework.user.user_extensions.student_id) +
               "_" + (homework.user.lastname.nil? ? "" : homework.user.lastname) + (homework.user.firstname.nil? ? "" : homework.user.firstname) +
-              "_" + homework.name + ".zip", :type => detect_content_type(zipfile) if(zipfile)
+              "_" + homework.name + ".zip", :type => detect_content_type(zipfile.file_path) if(zipfile)
         else
           render file: 'public/no_file_found.html'
         end
@@ -88,85 +90,116 @@ class ZipdownController < ApplicationController
   def zip_bid(bid)
     # Todo: User Access Controll
     bid_homework_path = []
+    digests = []
     bid.homeworks.each do |homeattach|
       unless homeattach.attachments.empty?
-        bid_homework_path << zip_homework_by_user(homeattach)
+        out_file = zip_homework_by_user(homeattach)
+        bid_homework_path << out_file.file_path
+        digests << out_file.file_digest
       end
     end
 
-    zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024)
-    x = 0
+    homework_id = bid.id
+    user_id = bid.author_id
 
 
-    zips.each { |o|
-      x += 1
-      file = zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o[:files], OUTPUT_FOLDER
-      o[:real_file] = file
-      o[:file] = File.basename(file)
-      o[:size] = (File.size(file) / 1024.0 / 1024.0).round(2)
+    out_file = find_or_pack(homework_id, user_id, digests.sort){
+      zipping("#{Time.now.to_i}_#{bid.name}.zip",
+              bid_homework_path, OUTPUT_FOLDER)
     }
 
+
+    # zips = split_pack_files(bid_homework_path, Setting.pack_attachment_max_size.to_i*1024)
+    # x = 0
+    #
+    #
+    # zips.each { |o|
+    #   x += 1
+    #   file = zipping "#{Time.now.to_i}_#{bid.name}_#{x}.zip", o[:files], OUTPUT_FOLDER
+    #   o[:real_file] = file
+    #   o[:file] = File.basename(file)
+    #   o[:size] = (File.size(file) / 1024.0 / 1024.0).round(2)
+    # }
+
+    [{files:[out_file.file_path], count: 1, index: 1,
+      real_file: out_file.file_path,  file: File.basename(out_file.file_path),
+      size:(out_file.pack_size / 1024.0 / 1024.0).round(2)
+     }]
   end
 
-  def zip_homework_by_user(homeattach)
+  def zip_homework_by_user(homework_attach)
     homeworks_attach_path = []
     not_exist_file = []
     # 需要将所有homework.attachments遍历加入zip
-    # 并且返回zip路径
-    homeattach.attachments.each do |attach|
+
+
+    digests = []
+    homework_attach.attachments.each do |attach|
       if File.exist?(attach.diskfile)
         homeworks_attach_path << attach.diskfile
+        digests << attach.digest
       else
         not_exist_file << attach.filename
+        digests << 'not_exist_file'
       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, not_exist_file)
+
+    out_file = find_or_pack(homework_attach.bid_id, homework_attach.user_id, digests.sort){
+      zipping("#{homework_attach.user.lastname}#{homework_attach.user.firstname}_#{((homework_attach.user.user_extensions.nil? || homework_attach.user.user_extensions.student_id.nil?) ? "" : homework_attach.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, not_exist_file=[])
-    # 输入待打包的文件列表，已经打包文件定位到ouput_path
-    ic = Iconv.new('GBK//IGNORE', 'UTF-8//IGNORE')
+  def find_or_pack(homework_id, user_id, digests)
+    raise "please given a pack block" unless block_given?
 
-    rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
-    zipfile_name = "#{output_path}/#{rename_zipfile}"
+    out_file = ZipPack.packed?(homework_id, user_id, digests.sort)
 
-    Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))
+    unless out_file && out_file.file_valid?
+      file = yield
+
+      ZipPack.where(homework_id: homework_id,
+                    user_id: user_id).delete_all
 
-    unless is_attachment
-      #都是zip合并，没必要再费力压缩了
-      Zip.default_compression = Zlib::NO_COMPRESSION
+      out_file = ZipPack.create(homework_id: homework_id,
+                                user_id: user_id,
+                                file_digest: Trustie::Utils.digest(file),
+                                file_path: file,
+                                pack_size: File.size(file),
+                                file_digests: digests.join(',')
+      )
     else
-      Zip.default_compression = Zlib::DEFAULT_COMPRESSION
+      out_file.pack_times = out_file.pack_times + 1
+      out_file.save
     end
 
+    out_file
+  end
+
+
+  def zipping(zip_name_refer, files_paths, output_path, is_attachment=false, not_exist_file=[])
+    rename_zipfile = zip_name_refer ||= "#{Time.now.to_i.to_s}.zip"
+    zipfile_name = "#{output_path}/#{rename_zipfile}"
+
+    Dir.mkdir(File.dirname(zipfile_name)) unless File.exist?(File.dirname(zipfile_name))
     Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
       files_paths.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
-
+        rename_file = File.basename(filename)
+        rename_file = filename_to_real( File.basename(filename)) if is_attachment
         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
+          zipfile.get_output_stream('FILE_NOTICE.txt'){|os| os.write l(:label_file_exist)}
           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
+        zipfile.get_output_stream('FILE_LOST.txt'){|os| os.write l(:label_file_lost) + not_exist_file.join(',').to_s}
       end
     end
     zipfile_name
-  #rescue Errno => e
-  #  logger.error "[zipdown#zipping] ===> #{e}"
-  #  @error = e
   end
 
   # 合理分配文件打包

app/helpers/account_helper.rb

@@ -23,7 +23,7 @@ module AccountHelper
     token = Token.new(:user => user, :action => "register")
     if user.save and token.save
       UserStatus.create(:user_id => user.id, :changsets_count => 0, :watchers_count => 0)
-      Mailer.register(token).deliver
+      Mailer.run.register(token)
       #flash[:notice] = l(:notice_account_register_done)
       #render action: 'email_valid', locals: {:mail => user.mail}
     else
@@ -51,7 +51,7 @@ module AccountHelper
     if user.save
       UserStatus.create(:user_id => user.id ,:changsets_count => 0, :watchers_count => 0)
       # Sends an email to the administrators
-      Mailer.account_activation_request(user).deliver
+      Mailer.run.account_activation_request(user)
       #account_pending
     else
       yield if block_given?

app/helpers/activities_helper.rb

@@ -30,4 +30,16 @@ module ActivitiesHelper
     end
     sorted_events 
   end
+  def sort_activity_events_course(events)
+    events_by_group = events.group_by(&:event_group)
+    sorted_events = []
+    events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each do |event|
+      if group_events = events_by_group.delete(event.event_group)
+        group_events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each_with_index do |e, i|
+          sorted_events << e unless e.event_description.nil?
+        end
+      end
+    end
+    sorted_events
+  end
 end

app/helpers/application_helper.rb

@@ -53,6 +53,10 @@ module ApplicationHelper
   # Author lizanle
   # Description after save后需要进行资源记录的更新
   # owner_type = 1 对应的是 memo
+  # owner_type = 2 对应的是forum
+  # owner_type = 3 对应的是message
+  # owner_type = 4 对应的是news
+  # owner_type = 5 对应的是comment
   def update_kindeditor_assets_owner ids,owner_id,owner_type
     ids.each do |id|
       asset = Kindeditor::Asset.find(id.to_i)
@@ -1676,6 +1680,42 @@ module ApplicationHelper
     courses_doing
   end
 
+
+  def attachment_candown attachment
+    candown = false
+    if attachment.container
+      if attachment.container.class.to_s != "HomeworkAttach" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
+        project = attachment.container.project
+        candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
+      elsif attachment.container.is_a?(Project)
+        project = attachment.container
+        candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
+      elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
+          attachment.container.board.project
+        project = attachment.container.board.project
+        candown = User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
+      elsif (attachment.container.has_attribute?(:course) ||attachment.container.has_attribute?(:course_id) ) && attachment.container.course
+        course = attachment.container.course
+        candown = User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+      elsif attachment.container.is_a?(Course)
+        course = attachment.container
+        candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+      elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
+          attachment.container.board.course
+        course = attachment.container.board.course
+        candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
+      elsif attachment.container.class.to_s=="HomeworkAttach" && attachment.container.bid.reward_type == 3
+        candown = true
+      elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
+        course = attachment.container.courses.first
+        candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)
+      else
+        candown = (attachment.is_public == 1 || attachment.is_public == true)
+      end
+    end
+    candown
+  end
+
   private
 
   def wiki_helper

app/helpers/attachments_helper.rb

@@ -77,6 +77,7 @@ module AttachmentsHelper
     end
   end
 
+  #判断课程course中是否包含课件attachment，course中引用了attachment也算作包含
   def course_contains_attachment? course,attachment
      course.attachments.each do |att|
        if att.id == attachment.id || (!att.copy_from.nil? && !attachment.copy_from.nil? && att.copy_from == attachment.copy_from) || att.copy_from == attachment.id || att.id == attachment.copy_from
@@ -85,6 +86,15 @@ module AttachmentsHelper
      end
      false
   end
+  #判断项目project中是否包含课件attachment，project中引用了attachment也算作包含
+  def project_contains_attachment? project,attachment
+    project.attachments.each do |att|
+      if att.id == attachment.id || (!att.copy_from.nil? && !attachment.copy_from.nil? && att.copy_from == attachment.copy_from) || att.copy_from == attachment.id || att.id == attachment.copy_from
+        return true
+      end
+    end
+    false
+  end
 
   def get_qute_number attachment
     if attachment.copy_from

app/helpers/courses_helper.rb

@@ -632,7 +632,7 @@ module CoursesHelper
   #获取课程动态
   def get_course_activity courses, activities
     @course_ids=activities.keys()
-
+    @bid_ids = []
     days = Setting.activity_days_default.to_i
     date_to ||= Date.today + 1
     date_from = date_to - days-1.years
@@ -653,8 +653,27 @@ module CoursesHelper
       activities[news.course_id]+=1
     end
 
+    #feedbackc_count
+    JournalsForMessage.where(jour_id: @course_ids, jour_type: Course).each do |jourformess|
+      activities[jourformess.jour_id]+=1
+    end
+
+    #homework_count
+    #HomeworkForCourse.where(course_id: @course_ids).each do |homework|
+    #  @bid_ids<<homework.bid_id
+    #  activities[homework.bid_id]+=Bid.where(id: @bid_ids).where("created_on>?",date_from).count
+
+    #end
+
+    #@bid_ids.each do |bid_id|
+    #  activities[] +=Bid.where(id: bid_id ).where("created_on>?",date_from).count
+
+    #end
+
+
+
     # 动态数 + 1 ( 某某创建了该课程 )
-    activities.each_pair { |key, value| activities[key] = value + 1 }
+    # activities.each_pair { |key, value| activities[key] = value + 1 }
     return activities
   end
 

app/helpers/files_helper.rb

@@ -45,6 +45,7 @@ module FilesHelper
     File.new(zipfile_name,'w+')
   end
 
+  #带勾选框的课程列表
   def courses_check_box_tags(name,courses,current_course,attachment)
     s = ''
     courses.each do |course|
@@ -55,6 +56,17 @@ module FilesHelper
     s.html_safe
   end
 
+  #带勾选框的项目列表
+  def projects_check_box_tags(name,projects,current_project,attachment)
+    s = ''
+    projects.each do |project|
+      if !project_contains_attachment?(project,attachment)  && User.current.allowed_to?(:manage_files, project)
+        s << "<label>#{ check_box_tag name, project.id, false, :id => nil } #{h project.name}</label>"
+      end
+    end
+    s.html_safe
+  end
+
   #判断用户是否拥有不包含当前资源的课程，需用户在该课程中角色为教师且该课程属于当前学期或下一学期
   def has_course? user,file
     result = false
@@ -66,6 +78,17 @@ module FilesHelper
     result
   end
 
+  #判断用户是否拥有不包含当前资源的项目，需用户在该项目中有资源管理相关资源
+  def has_project? user,file
+    result = false
+    user.projects.each do |project|
+      if !project_contains_attachment?(project,file) && User.current.allowed_to?(:manage_files, project)
+        return true
+      end
+    end
+    result
+  end
+
   # 判断指定的资源时候符合类型
   def isTypeOk(attachment, type, contentType)
     result = false
@@ -97,49 +120,23 @@ module FilesHelper
     result
   end
 
-  def visable_attachemnts_insite attachments,course
+  def visable_attachemnts_insite attachments,obj
     result = []
-    attachments.each do |attachment|
-      if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == course.id  && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
-        result << attachment
+    if obj.is_a?(Course)
+      attachments.each do |attachment|
+        if attachment.is_public? || (attachment.container_type == "Course" && attachment.container_id == obj.id  && User.current.member_of_course?(Course.find(attachment.container_id)))|| attachment.author_id == User.current.id
+          result << attachment
+        end
       end
+    else if obj.is_a?(Project)
+     attachments.each do |attachment|
+       if attachment.is_public? || (attachment.container_type == "Project" && attachment.container_id == obj.id  && User.current.member_of_course?(Project.find(attachment.container_id)))|| attachment.author_id == User.current.id
+         result << attachment
+       end
+     end
     end
-    result
   end
-
-  def attachment_candown attachment
-    candown = false
-    if attachment.container
-    if attachment.container.class.to_s != "HomeworkAttach" && (attachment.container.has_attribute?(:project) || attachment.container.has_attribute?(:project_id)) && attachment.container.project
-      project = attachment.container.project
-      candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
-    elsif attachment.container.is_a?(Project)
-      project = attachment.container
-      candown= User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
-    elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
-        attachment.container.board.project
-      project = attachment.container.board.project
-      candown = User.current.member_of?(project) || (project.is_public && attachment.is_public == 1)
-    elsif (attachment.container.has_attribute?(:course) ||attachment.container.has_attribute?(:course_id) ) && attachment.container.course
-      course = attachment.container.course
-      candown = User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
-    elsif attachment.container.is_a?(Course)
-      course = attachment.container
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
-    elsif (attachment.container.has_attribute?(:board) || attachment.container.has_attribute?(:board_id)) && attachment.container.board &&
-        attachment.container.board.course
-      course = attachment.container.board.course
-      candown= User.current.member_of_course?(course) || (course.is_public==1 && attachment.is_public == 1)
-    elsif attachment.container.class.to_s=="HomeworkAttach" && attachment.container.bid.reward_type == 3
-      candown = true
-    elsif  attachment.container_type == "Bid" && attachment.container && attachment.container.courses
-      course = attachment.container.courses.first
-      candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)
-    else
-      candown = (attachment.is_public == 1 || attachment.is_public == true)
-    end
-    end
-    candown
+  result
   end
 
 

app/helpers/owner_type_helper.rb

@@ -0,0 +1,9 @@
+module OwnerTypeHelper
+  MEMO = 1
+  FORUM = 2
+  MESSAGE = 3
+  NEWS = 4
+  COMMENT = 5
+  BID = 6
+  JOURNALSFORMESSAGE = 7
+end

app/models/bid.rb

@@ -17,7 +17,8 @@ class Bid < ActiveRecord::Base
   HomeworkProject = 2
   attr_accessible :author_id, :budget, :deadline, :name, :description, :homework_type, :password
   include Redmine::SafeAttributes
-
+  include ApplicationHelper
+  has_many_kindeditor_assets :assets, :dependent => :destroy
   belongs_to :author, :class_name => 'User', :foreign_key => :author_id
   belongs_to :course
   has_many :biding_projects, :dependent => :destroy
@@ -47,7 +48,7 @@ class Bid < ActiveRecord::Base
   validate :validate_user
   validate :validate_reward_type
   after_create :act_as_activity
-
+  after_destroy :delete_kindeditor_assets
   scope :visible, lambda {|*args|
     nil
   }
@@ -157,5 +158,10 @@ class Bid < ActiveRecord::Base
     end
   end
 
-
+  # Time 2015-04-01 14:19:06
+  # Author lizanle
+  # Description 删除对应课程通知的图片资源
+  def delete_kindeditor_assets
+    delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::BID
+  end
 end