tagged version 0.8.0-RC1

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/tags/0.8.0-RC1@2108 e93f8b46-1217-0410-a6f0-8f06a7374b81

app/apis/sys_api.rb

@@ -15,11 +15,19 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+class AWSProjectWithRepository < ActionWebService::Struct
+  member :id,              :int
+  member :identifier,      :string
+  member :name,            :string
+  member :is_public,       :bool
+  member :repository,      Repository
+end
+
 class SysApi < ActionWebService::API::Base
-  api_method :projects,
+  api_method :projects_with_repository_enabled,
              :expects => [],
-             :returns => [[Project]]
+             :returns => [[AWSProjectWithRepository]]
   api_method :repository_created,
-             :expects => [:int, :string],
+             :expects => [:string, :string, :string],
              :returns => [:int]
 end

app/controllers/account_controller.rb

@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -16,18 +16,25 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AccountController < ApplicationController
-  layout 'base'	
   helper :custom_fields
   include CustomFieldsHelper   
   
   # prevents login action to be filtered by check_if_login_required application scope filter
-  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
-  before_filter :require_login, :only => :logout
+  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
 
   # Show user's account
   def show
-    @user = User.find(params[:id])
-    @custom_values = @user.custom_values.find(:all, :include => :custom_field)
+    @user = User.active.find(params[:id])
+    @custom_values = @user.custom_values
+    
+    # show only public projects and private projects that the logged in user is also a member of
+    @memberships = @user.memberships.select do |membership|
+      membership.project.is_public? || (User.current.member_of?(membership.project))
+    end
+    
+    events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
+    @events_by_day = events.group_by(&:event_date)
+    
   rescue ActiveRecord::RecordNotFound
     render_404
   end
@@ -36,31 +43,45 @@ class AccountController < ApplicationController
   def login
     if request.get?
       # Logout user
-      self.logged_in_user = nil
+      self.logged_user = nil
     else
       # Authenticate user
-      user = User.try_to_login(params[:login], params[:password])
-      if user
-        self.logged_in_user = user
-        redirect_back_or_default :controller => 'my', :action => 'page'
+      user = User.try_to_login(params[:username], params[:password])
+      if user.nil?
+        # Invalid credentials
+        flash.now[:error] = l(:notice_account_invalid_creditentials)
+      elsif user.new_record?
+        # Onthefly creation failed, display the registration form to fill/fix attributes
+        @user = user
+        session[:auth_source_registration] = {:login => user.login, :auth_source_id => user.auth_source_id }
+        render :action => 'register'
       else
-        flash.now[:notice] = l(:notice_account_invalid_creditentials)
+        # Valid user
+        self.logged_user = user
+        # generate a key and set cookie if autologin
+        if params[:autologin] && Setting.autologin?
+          token = Token.create(:user => user, :action => 'autologin')
+          cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
+        end
+        redirect_back_or_default :controller => 'my', :action => 'page'
       end
     end
   end
 
   # Log out current user and redirect to welcome page
   def logout
-    self.logged_in_user = nil
-    redirect_to :controller => 'welcome'
+    cookies.delete :autologin
+    Token.delete_all(["user_id = ? AND action = ?", User.current.id, 'autologin']) if User.current.logged?
+    self.logged_user = nil
+    redirect_to home_url
   end
   
   # Enable user to choose a new password
   def lost_password
-    redirect_to :controller => 'welcome' and return unless Setting.lost_password?
+    redirect_to(home_url) && return unless Setting.lost_password?
     if params[:token]
       @token = Token.find_by_action_and_value("recovery", params[:token])
-      redirect_to :controller => 'welcome' and return unless @token and !@token.expired?
+      redirect_to(home_url) && return unless @token and !@token.expired?
       @user = @token.user
       if request.post?
         @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
@@ -77,9 +98,9 @@ class AccountController < ApplicationController
       if request.post?
         user = User.find_by_mail(params[:mail])
         # user not found in db
-        flash.now[:notice] = l(:notice_account_unknown_email) and return unless user
+        flash.now[:error] = l(:notice_account_unknown_email) and return unless user
         # user uses an external authentification
-        flash.now[:notice] = l(:notice_can_t_change_password) and return if user.auth_source_id
+        flash.now[:error] = l(:notice_can_t_change_password) and return if user.auth_source_id
         # create a new token for password recovery
         token = Token.new(:user => user, :action => "recovery")
         if token.save
@@ -94,38 +115,80 @@ class AccountController < ApplicationController
   
   # User self-registration
   def register
-    redirect_to :controller => 'welcome' and return unless Setting.self_registration?
-    if params[:token]
-      token = Token.find_by_action_and_value("register", params[:token])
-      redirect_to :controller => 'welcome' and return unless token and !token.expired?
-      user = token.user
-      redirect_to :controller => 'welcome' and return unless user.status == User::STATUS_REGISTERED
-      user.status = User::STATUS_ACTIVE
-      if user.save
-        token.destroy
-        flash[:notice] = l(:notice_account_activated)
-        redirect_to :action => 'login'
-        return
-      end      
+    redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
+    if request.get?
+      session[:auth_source_registration] = nil
+      @user = User.new(:language => Setting.default_language)
     else
-      if request.get?
-        @user = User.new(:language => Setting.default_language)
-        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
+      @user = User.new(params[:user])
+      @user.admin = false
+      @user.status = User::STATUS_REGISTERED
+      if session[:auth_source_registration]
+        @user.status = User::STATUS_ACTIVE
+        @user.login = session[:auth_source_registration][:login]
+        @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
+        if @user.save
+          session[:auth_source_registration] = nil
+          self.logged_user = @user
+          flash[:notice] = l(:notice_account_activated)
+          redirect_to :controller => 'my', :action => 'account'
+        end
       else
-        @user = User.new(params[:user])
-        @user.admin = false
         @user.login = params[:user][:login]
-        @user.status = User::STATUS_REGISTERED
         @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-        @user.custom_values = @custom_values
-        token = Token.new(:user => @user, :action => "register")
-        if @user.save and token.save
-          Mailer.deliver_register(token)
-          flash[:notice] = l(:notice_account_register_done)
-          redirect_to :controller => 'welcome' and return
+        case Setting.self_registration
+        when '1'
+          # Email activation
+          token = Token.new(:user => @user, :action => "register")
+          if @user.save and token.save
+            Mailer.deliver_register(token)
+            flash[:notice] = l(:notice_account_register_done)
+            redirect_to :action => 'login'
+          end
+        when '3'
+          # Automatic activation
+          @user.status = User::STATUS_ACTIVE
+          if @user.save
+            self.logged_user = @user
+            flash[:notice] = l(:notice_account_activated)
+            redirect_to :controller => 'my', :action => 'account'
+          end
+        else
+          # Manual activation by the administrator
+          if @user.save
+            # Sends an email to the administrators
+            Mailer.deliver_account_activation_request(@user)
+            flash[:notice] = l(:notice_account_pending)
+            redirect_to :action => 'login'
+          end
         end
       end
     end
   end
+  
+  # Token based account activation
+  def activate
+    redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
+    token = Token.find_by_action_and_value('register', params[:token])
+    redirect_to(home_url) && return unless token and !token.expired?
+    user = token.user
+    redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
+    user.status = User::STATUS_ACTIVE
+    if user.save
+      token.destroy
+      flash[:notice] = l(:notice_account_activated)
+    end
+    redirect_to :action => 'login'
+  end
+  
+private
+  def logged_user=(user)
+    if user && user.is_a?(User)
+      User.current = user
+      session[:user_id] = user.id
+    else
+      User.current = User.anonymous
+      session[:user_id] = nil
+    end
+  end
 end

app/controllers/admin_controller.rb

@@ -16,45 +16,77 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AdminController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   helper :sort
   include SortHelper	
 
-  def index	
+  def index
+    @no_configuration_data = Redmine::DefaultData::Loader::no_data?
   end
 	
   def projects
     sort_init 'name', 'asc'
-    sort_update		
-    @project_count = Project.count		
+    sort_update
+    
+    @status = params[:status] ? params[:status].to_i : 1
+    c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
+    
+    unless params[:name].blank?
+      name = "%#{params[:name].strip.downcase}%"
+      c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name]
+    end
+    
+    @project_count = Project.count(:conditions => c.conditions)
     @project_pages = Paginator.new self, @project_count,
-								15,
+								per_page_option,
 								params['page']								
     @projects = Project.find :all, :order => sort_clause,
+                        :conditions => c.conditions,
 						:limit  =>  @project_pages.items_per_page,
 						:offset =>  @project_pages.current.offset
 
     render :action => "projects", :layout => false if request.xhr?
   end
-
-  def mail_options
-    @actions = Permission.find(:all, :conditions => ["mail_option=?", true]) || []
+  
+  def plugins
+    @plugins = Redmine::Plugin.all
+  end
+  
+  # Loads the default configuration
+  # (roles, trackers, statuses, workflow, enumerations)
+  def default_configuration
     if request.post?
-      @actions.each { |a|
-        a.mail_enabled = (params[:action_ids] || []).include? a.id.to_s 
-        a.save
-      }
-      flash.now[:notice] = l(:notice_successful_update)
+      begin
+        Redmine::DefaultData::Loader::load(params[:lang])
+        flash[:notice] = l(:notice_default_data_loaded)
+      rescue Exception => e
+        flash[:error] = l(:error_can_t_load_default_data, e.message)
+      end
     end
+    redirect_to :action => 'index'
+  end
+  
+  def test_email
+    raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
+    # Force ActionMailer to raise delivery errors so we can catch it
+    ActionMailer::Base.raise_delivery_errors = true
+    begin
+      @test = Mailer.deliver_test(User.current)
+      flash[:notice] = l(:notice_email_sent, User.current.mail)
+    rescue Exception => e
+      flash[:error] = l(:notice_email_error, e.message)
+    end
+    ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
+    redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
   end
   
   def info
     @db_adapter_name = ActiveRecord::Base.connection.adapter_name
-    @flags = Hash.new
-    @flags[:default_admin_changed] = User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?
-    @flags[:file_repository_writable] = File.writable?(Attachment.storage_path)
-    @flags[:textile_available] = ActionView::Helpers::TextHelper.method_defined? "textilize"
+    @flags = {
+      :default_admin_changed => User.find(:first, :conditions => ["login=? and hashed_password=?", 'admin', User.hash_password('admin')]).nil?,
+      :file_repository_writable => File.writable?(Attachment.storage_path),
+      :rmagick_available => Object.const_defined?(:Magick)
+    }
   end  
 end

app/controllers/application.rb

@@ -15,42 +15,63 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'uri'
+require 'cgi'
+
 class ApplicationController < ActionController::Base
-  before_filter :check_if_login_required, :set_localization
+  layout 'base'
+  
+  before_filter :user_setup, :check_if_login_required, :set_localization
   filter_parameter_logging :password
   
-  def logged_in_user=(user)
-    @logged_in_user = user
-    session[:user_id] = (user ? user.id : nil)
+  include Redmine::MenuManager::MenuController
+  helper Redmine::MenuManager::MenuHelper
+  
+  REDMINE_SUPPORTED_SCM.each do |scm|
+    require_dependency "repository/#{scm.underscore}"
   end
   
-  def logged_in_user
+  def current_role
+    @current_role ||= User.current.role_for_project(@project)
+  end
+  
+  def user_setup
+    # Check the settings cache for each request
+    Setting.check_cache
+    # Find the current user
+    User.current = find_current_user
+  end
+  
+  # Returns the current user or nil if no user is logged in
+  def find_current_user
     if session[:user_id]
-      @logged_in_user ||= User.find(session[:user_id])
-    else
-      nil
+      # existing session
+      (User.active.find(session[:user_id]) rescue nil)
+    elsif cookies[:autologin] && Setting.autologin?
+      # auto-login feature
+      User.find_by_autologin_key(cookies[:autologin])
+    elsif params[:key] && accept_key_auth_actions.include?(params[:action])
+      # RSS key authentication
+      User.find_by_rss_key(params[:key])
     end
   end
   
-  # Returns the role that the logged in user has on the current project
-  # or nil if current user is not a member of the project
-  def logged_in_user_membership
-    @user_membership ||= logged_in_user.role_for_project(@project)
-  end
-  
   # check if login is globally required to access the application
   def check_if_login_required
+    # no check needed if user is already logged in
+    return true if User.current.logged?
     require_login if Setting.login_required?
   end 
   
   def set_localization
+    User.current.language = nil unless User.current.logged?
     lang = begin
-      if self.logged_in_user and self.logged_in_user.language and !self.logged_in_user.language.empty? and GLoc.valid_languages.include? self.logged_in_user.language.to_sym
-        self.logged_in_user.language
+      if !User.current.language.blank? && GLoc.valid_language?(User.current.language)
+        User.current.language
       elsif request.env['HTTP_ACCEPT_LANGUAGE']
-        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
-        if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
-          accept_lang
+        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
+        if !accept_lang.blank? && (GLoc.valid_language?(accept_lang) || GLoc.valid_language?(accept_lang = accept_lang.split('-').first))
+          User.current.language = accept_lang
         end
       end
     rescue
@@ -60,9 +81,8 @@ class ApplicationController < ActionController::Base
   end
   
   def require_login
-    unless self.logged_in_user
-      store_location
-      redirect_to :controller => "account", :action => "login"
+    if !User.current.logged?
+      redirect_to :controller => "account", :action => "login", :back_url => url_for(params)
       return false
     end
     true
@@ -70,62 +90,115 @@ class ApplicationController < ActionController::Base
 
   def require_admin
     return unless require_login
-    unless self.logged_in_user.admin?
-      render :nothing => true, :status => 403
+    if !User.current.admin?
+      render_403
       return false
     end
     true
   end
+  
+  def deny_access
+    User.current.logged? ? render_403 : require_login
+  end
 
-  # authorizes the user for the requested action.
+  # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action])
-    # check if action is allowed on public projects
-    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ ctrl, action ]
-      return true
-    end    
-    # if action is not public, force login
-    return unless require_login    
-    # admin is always authorized
-    return true if self.logged_in_user.admin?
-    # if not admin, check membership permission    
-    if logged_in_user_membership and Permission.allowed_to_role( "%s/%s" % [ ctrl, action ], logged_in_user_membership )    
-      return true		
-    end		
-    render :nothing => true, :status => 403
-    false
+    allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
+    allowed ? true : deny_access
   end
   
   # make sure that the user is a member of the project (or admin) if project is private
   # used as a before_filter for actions that do not require any particular permission on the project
   def check_project_privacy
-    return true if @project.is_public?
-    return false unless logged_in_user
-    return true if logged_in_user.admin? || logged_in_user_membership
-    render :nothing => true, :status => 403
-    false
-  end
-
-  # store current uri in session.
-  # return to this location by calling redirect_back_or_default
-  def store_location
-    session[:return_to_params] = params
-  end
-
-  # move to the last store_location call or to the passed default one
-  def redirect_back_or_default(default)
-    if session[:return_to_params].nil?
-      redirect_to default
+    if @project && @project.active?
+      if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
+        true
+      else
+        User.current.logged? ? render_403 : require_login
+      end
     else
-      redirect_to session[:return_to_params]
-      session[:return_to_params] = nil
+      @project = nil
+      render_404
+      false
     end
   end
+
+  def redirect_back_or_default(default)
+    back_url = CGI.unescape(params[:back_url].to_s)
+    if !back_url.blank?
+      uri = URI.parse(back_url)
+      # do not redirect user to another host or to the login or register page
+      if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
+        redirect_to(back_url) and return
+      end
+    end
+    redirect_to default
+  end
   
-  def render_404
-    @html_title = "404"
-    render :template => "common/404", :layout => true, :status => 404
+  def render_403
+    @project = nil
+    render :template => "common/403", :layout => !request.xhr?, :status => 403
     return false
   end
+    
+  def render_404
+    render :template => "common/404", :layout => !request.xhr?, :status => 404
+    return false
+  end
+  
+  def render_error(msg)
+    flash.now[:error] = msg
+    render :nothing => true, :layout => !request.xhr?, :status => 500
+  end
+  
+  def render_feed(items, options={})    
+    @items = items || []
+    @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
+    @items = @items.slice(0, Setting.feeds_limit.to_i)
+    @title = options[:title] || Setting.app_title
+    render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
+  end
+  
+  def self.accept_key_auth(*actions)
+    actions = actions.flatten.map(&:to_s)
+    write_inheritable_attribute('accept_key_auth_actions', actions)
+  end
+  
+  def accept_key_auth_actions
+    self.class.read_inheritable_attribute('accept_key_auth_actions') || []
+  end
+  
+  # TODO: move to model
+  def attach_files(obj, attachments)
+    attached = []
+    if attachments && attachments.is_a?(Hash)
+      attachments.each_value do |attachment|
+        file = attachment['file']
+        next unless file && file.size > 0
+        a = Attachment.create(:container => obj, 
+                              :file => file,
+                              :description => attachment['description'].to_s.strip,
+                              :author => User.current)
+        attached << a unless a.new_record?
+      end
+    end
+    attached
+  end
+
+  # Returns the number of objects that should be displayed
+  # on the paginated list
+  def per_page_option
+    per_page = nil
+    if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
+      per_page = params[:per_page].to_s.to_i
+      session[:per_page] = per_page
+    elsif session[:per_page]
+      per_page = session[:per_page]
+    else
+      per_page = Setting.per_page_options_array.first || 25
+    end
+    per_page
+  end
 
   # qvalues http header parser
   # code taken from webrick
@@ -145,4 +218,9 @@ class ApplicationController < ActionController::Base
     end
     return tmp
   end
-end
+  
+  # Returns a string that can be used as filename value in Content-Disposition header
+  def filename_for_content_disposition(name)
+    request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
+  end
+end

app/controllers/attachments_controller.rb

@@ -0,0 +1,55 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class AttachmentsController < ApplicationController
+  before_filter :find_project
+
+  def show
+    if @attachment.is_diff?
+      @diff = File.new(@attachment.diskfile, "rb").read
+      render :action => 'diff'
+    elsif @attachment.is_text?
+      @content = File.new(@attachment.diskfile, "rb").read
+      render :action => 'file'
+    elsif
+      download
+    end
+  end
+  
+  def download
+    @attachment.increment_download if @attachment.container.is_a?(Version)
+    
+    # images are sent inline
+    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                    :type => @attachment.content_type, 
+                                    :disposition => (@attachment.image? ? 'inline' : 'attachment')
+  end
+ 
+private
+  def find_project
+    @attachment = Attachment.find(params[:id])
+    # Show 404 if the filename in the url is wrong
+    raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
+    
+    @project = @attachment.project
+    permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
+    allowed = User.current.allowed_to?(permission, @project)
+    allowed ? true : (User.current.logged? ? render_403 : require_login)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/auth_sources_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AuthSourcesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   def index
@@ -65,10 +64,10 @@ class AuthSourcesController < ApplicationController
     @auth_method = AuthSource.find(params[:id])
     begin
       @auth_method.test_connection
+      flash[:notice] = l(:notice_successful_connection)
     rescue => text
-      flash[:notice] = text
+      flash[:error] = "Unable to connect (#{text})"
     end
-    flash[:notice] ||= l(:notice_successful_connection)
     redirect_to :action => 'list'
   end
 

app/controllers/boards_controller.rb

@@ -0,0 +1,85 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class BoardsController < ApplicationController
+  before_filter :find_project, :authorize
+
+  helper :messages
+  include MessagesHelper
+  helper :sort
+  include SortHelper
+  helper :watchers
+  include WatchersHelper
+ 
+  def index
+    @boards = @project.boards
+    # show the board if there is only one
+    if @boards.size == 1
+      @board = @boards.first
+      show
+    end
+  end
+
+  def show
+    sort_init "#{Message.table_name}.updated_on", "desc"
+    sort_update	
+      
+    @topic_count = @board.topics.count
+    @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
+    @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
+                                  :include => [:author, {:last_reply => :author}],
+                                  :limit  =>  @topic_pages.items_per_page,
+                                  :offset =>  @topic_pages.current.offset
+    render :action => 'show', :layout => !request.xhr?
+  end
+  
+  verify :method => :post, :only => [ :destroy ], :redirect_to => { :action => :index }
+
+  def new
+    @board = Board.new(params[:board])
+    @board.project = @project
+    if request.post? && @board.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+    end
+  end
+
+  def edit
+    if request.post? && @board.update_attributes(params[:board])
+      case params[:position]
+      when 'highest'; @board.move_to_top
+      when 'higher'; @board.move_higher
+      when 'lower'; @board.move_lower
+      when 'lowest'; @board.move_to_bottom
+      end if params[:position]
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+    end
+  end
+
+  def destroy
+    @board.destroy
+    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'boards'
+  end
+  
+private
+  def find_project
+    @project = Project.find(params[:project_id])
+    @board = @project.boards.find(params[:id]) if params[:id]
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/custom_fields_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CustomFieldsController < ApplicationController
-  layout 'base'		
   before_filter :require_admin
 
   def index
@@ -25,7 +24,7 @@ class CustomFieldsController < ApplicationController
   end
 
   def list
-    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.type.to_s }
+    @custom_fields_by_type = CustomField.find(:all).group_by {|f| f.class.name }
     @tab = params[:tab] || 'IssueCustomField'
     render :action => "list", :layout => false if request.xhr?
   end
@@ -39,13 +38,15 @@ class CustomFieldsController < ApplicationController
         @custom_field = UserCustomField.new(params[:custom_field])
       when "ProjectCustomField" 
         @custom_field = ProjectCustomField.new(params[:custom_field])
+      when "TimeEntryCustomField" 
+        @custom_field = TimeEntryCustomField.new(params[:custom_field])
       else
         redirect_to :action => 'list'
         return
     end  
     if request.post? and @custom_field.save
       flash[:notice] = l(:notice_successful_create)
-      redirect_to :action => 'list', :tab => @custom_field.type
+      redirect_to :action => 'list', :tab => @custom_field.class.name
     end
     @trackers = Tracker.find(:all, :order => 'position')
   end
@@ -57,16 +58,31 @@ class CustomFieldsController < ApplicationController
         @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
       end
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list', :tab => @custom_field.type
+      redirect_to :action => 'list', :tab => @custom_field.class.name
     end
     @trackers = Tracker.find(:all, :order => 'position')
   end
 
+  def move
+    @custom_field = CustomField.find(params[:id])
+    case params[:position]
+    when 'highest'
+      @custom_field.move_to_top
+    when 'higher'
+      @custom_field.move_higher
+    when 'lower'
+      @custom_field.move_lower
+    when 'lowest'
+      @custom_field.move_to_bottom
+    end if params[:position]
+    redirect_to :action => 'list', :tab => @custom_field.class.name
+  end
+  
   def destroy
     @custom_field = CustomField.find(params[:id]).destroy
-    redirect_to :action => 'list', :tab => @custom_field.type
+    redirect_to :action => 'list', :tab => @custom_field.class.name
   rescue
-    flash[:notice] = "Unable to delete custom field"
+    flash[:error] = "Unable to delete custom field"
     redirect_to :action => 'list'
   end
 end

app/controllers/documents_controller.rb

@@ -16,13 +16,42 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DocumentsController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize
-
+  before_filter :find_project, :only => [:index, :new]
+  before_filter :find_document, :except => [:index, :new]
+  before_filter :authorize
+  
+  helper :attachments
+  
+  def index
+    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
+    documents = @project.documents.find :all, :include => [:attachments, :category]
+    case @sort_by
+    when 'date'
+      @grouped = documents.group_by {|d| d.created_on.to_date }
+    when 'title'
+      @grouped = documents.group_by {|d| d.title.first.upcase}
+    when 'author'
+      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
+    else
+      @grouped = documents.group_by(&:category)
+    end
+    render :layout => false if request.xhr?
+  end
+  
   def show
     @attachments = @document.attachments.find(:all, :order => "created_on DESC")
   end
 
+  def new
+    @document = @project.documents.build(params[:document])    
+    if request.post? and @document.save	
+      attach_files(@document, params[:attachments])
+      flash[:notice] = l(:notice_successful_create)
+      Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
+      redirect_to :action => 'index', :project_id => @project
+    end
+  end
+  
   def edit
     @categories = Enumeration::get_values('DCAT')
     if request.post? and @document.update_attributes(params[:document])
@@ -33,26 +62,12 @@ class DocumentsController < ApplicationController
 
   def destroy
     @document.destroy
-    redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
+    redirect_to :controller => 'documents', :action => 'index', :project_id => @project
   end
-
-  def download
-    @attachment = @document.attachments.find(params[:attachment_id])
-    @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
-    render_404
-  end 
   
   def add_attachment
-    # Save the attachments
-    @attachments = []
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @document, :file => file, :author => logged_in_user)
-      @attachments << a unless a.new_record?
-    } if params[:attachments] and params[:attachments].is_a? Array
-    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+    attachments = attach_files(@document, params[:attachments])
+    Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
     redirect_to :action => 'show', :id => @document
   end
   
@@ -63,9 +78,15 @@ class DocumentsController < ApplicationController
 
 private
   def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def find_document
     @document = Document.find(params[:id])
     @project = @document.project
   rescue ActiveRecord::RecordNotFound
     render_404
-  end  
+  end
 end

app/controllers/enumerations_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class EnumerationsController < ApplicationController
-  layout 'base'
   before_filter :require_admin
   
   def index
@@ -59,12 +58,36 @@ class EnumerationsController < ApplicationController
     end
   end
 
+  def move
+    @enumeration = Enumeration.find(params[:id])
+    case params[:position]
+    when 'highest'
+      @enumeration.move_to_top
+    when 'higher'
+      @enumeration.move_higher
+    when 'lower'
+      @enumeration.move_lower
+    when 'lowest'
+      @enumeration.move_to_bottom
+    end if params[:position]
+    redirect_to :action => 'index'
+  end
+  
   def destroy
-    Enumeration.find(params[:id]).destroy
-    flash[:notice] = l(:notice_successful_delete)
-    redirect_to :action => 'list'
-  rescue
-    flash[:notice] = "Unable to delete enumeration"
-    redirect_to :action => 'list'
+    @enumeration = Enumeration.find(params[:id])
+    if !@enumeration.in_use?
+      # No associated objects
+      @enumeration.destroy
+      redirect_to :action => 'index'
+    elsif params[:reassign_to_id]
+      if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
+        @enumeration.destroy(reassign_to)
+        redirect_to :action => 'index'
+      end
+    end
+    @enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
+  #rescue
+  #  flash[:error] = 'Unable to delete enumeration'
+  #  redirect_to :action => 'index'
   end
 end

app/controllers/feeds_controller.rb

@@ -1,96 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  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.
-
-class FeedsController < ApplicationController
-  before_filter :find_scope
-  session :off
-
-  helper :issues
-  include IssuesHelper
-  helper :custom_fields
-  include CustomFieldsHelper
-    
-  # news feeds
-  def news
-    News.with_scope(:find => @find_options) do
-      @news = News.find :all, :order => "#{News.table_name}.created_on DESC", :include => [ :author, :project ]
-    end
-    headers["Content-Type"] = "application/rss+xml"
-    render :action => 'news_atom' if 'atom' == params[:format]
-  end
-  
-  # issue feeds
-  def issues
-    if @project && params[:query_id]
-      query = Query.find(params[:query_id])
-      # ignore query if it's not valid
-      query = nil unless query.valid?
-      # override with query conditions
-      @find_options[:conditions] = query.statement if query.valid? and @project == query.project
-    end
-
-    Issue.with_scope(:find => @find_options) do
-      @issues = Issue.find :all, :include => [:project, :author, :tracker, :status], 
-                                 :order => "#{Issue.table_name}.created_on DESC"
-    end
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
-    headers["Content-Type"] = "application/rss+xml"
-    render :action => 'issues_atom' if 'atom' == params[:format]
-  end
-  
-  # issue changes feeds
-  def history    
-    if @project && params[:query_id]
-      query = Query.find(params[:query_id])
-      # ignore query if it's not valid
-      query = nil unless query.valid?
-      # override with query conditions
-      @find_options[:conditions] = query.statement if query.valid? and @project == query.project
-    end
-
-    Journal.with_scope(:find => @find_options) do
-      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ], 
-                                     :order => "#{Journal.table_name}.created_on DESC"
-    end
-    
-    @title = (@project ? @project.name : Setting.app_title) + ": " + (query ? query.name : l(:label_reported_issues))
-    headers["Content-Type"] = "application/rss+xml"
-    render :action => 'history_atom' if 'atom' == params[:format]
-  end
-   
-private
-  # override for feeds specific authentication
-  def check_if_login_required
-    @user = User.find_by_rss_key(params[:key])
-    render(:nothing => true, :status => 403) and return false if !@user && Setting.login_required?
-  end
-  
-  def find_scope
-    if params[:project_id]
-      # project feed
-      # check if project is public or if the user is a member
-      @project = Project.find(params[:project_id])
-      render(:nothing => true, :status => 403) and return false unless @project.is_public? || (@user && @user.role_for_project(@project))
-      scope = ["#{Project.table_name}.id=?", params[:project_id].to_i]
-    else
-      # global feed
-      scope = ["#{Project.table_name}.is_public=?", true]
-    end
-    @find_options = {:conditions => scope, :limit => Setting.feeds_limit}
-    return true
-  end
-end

app/controllers/help_controller.rb

@@ -1,44 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006  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.
-
-class HelpController < ApplicationController
-
-  skip_before_filter :check_if_login_required
-  before_filter :load_help_config
-
-  # displays help page for the requested controller/action
-  def index	
-    # select help page to display
-    if params[:ctrl] and @help_config['pages'][params[:ctrl]]
-      if params[:page] and @help_config['pages'][params[:ctrl]][params[:page]]
-        template = @help_config['pages'][params[:ctrl]][params[:page]]
-      else
-        template = @help_config['pages'][params[:ctrl]]['index']
-      end
-    end
-    # choose language according to available help translations
-    lang = (@help_config['langs'].include? current_language.to_s) ? current_language.to_s : @help_config['langs'].first
-	
-    url = "/manual/#{lang}/" + (template || "index.html")
-    redirect_to(request.relative_url_root + url)
-  end
-
-private
-  def load_help_config
-    @help_config = YAML::load(File.open("#{RAILS_ROOT}/config/help.yml"))
-  end	
-end

app/controllers/issue_categories_controller.rb

@@ -16,8 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategoriesController < ApplicationController
-  layout 'base'
+  menu_item :settings
   before_filter :find_project, :authorize
+  
+  verify :method => :post, :only => :destroy
 
   def edit
     if request.post? and @category.update_attributes(params[:category])
@@ -27,11 +29,17 @@ class IssueCategoriesController < ApplicationController
   end
 
   def destroy
-    @category.destroy
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-  rescue
-    flash[:notice] = "Categorie can't be deleted"
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+    @issue_count = @category.issues.size
+    if @issue_count == 0
+      # No issue assigned to this category
+      @category.destroy
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+    elsif params[:todo]
+      reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
+      @category.destroy(reassign_to)
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+    end
+    @categories = @project.issue_categories - [@category]
   end
 
 private

app/controllers/issue_relations_controller.rb

@@ -0,0 +1,58 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class IssueRelationsController < ApplicationController
+  before_filter :find_project, :authorize
+  
+  def new
+    @relation = IssueRelation.new(params[:relation])
+    @relation.issue_from = @issue
+    @relation.save if request.post?
+    respond_to do |format|
+      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
+      format.js do
+        render :update do |page|
+          page.replace_html "relations", :partial => 'issues/relations'
+          if @relation.errors.empty?
+            page << "$('relation_delay').value = ''"
+            page << "$('relation_issue_to_id').value = ''"
+          end
+        end
+      end
+    end
+  end
+  
+  def destroy
+    relation = IssueRelation.find(params[:id])
+    if request.post? && @issue.relations.include?(relation)
+      relation.destroy
+      @issue.reload
+    end
+    respond_to do |format|
+      format.html { redirect_to :controller => 'issues', :action => 'show', :id => @issue }
+      format.js { render(:update) {|page| page.replace_html "relations", :partial => 'issues/relations'} }
+    end
+  end
+  
+private
+  def find_project
+    @issue = Issue.find(params[:issue_id])
+    @project = @issue.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/issue_statuses_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueStatusesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :create, :update, :move ],
@@ -79,7 +78,7 @@ class IssueStatusesController < ApplicationController
     IssueStatus.find(params[:id]).destroy
     redirect_to :action => 'list'
   rescue
-    flash[:notice] = "Unable to delete issue status"
+    flash[:error] = "Unable to delete issue status"
     redirect_to :action => 'list'
   end  	
 end

app/controllers/issues_controller.rb

@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -16,144 +16,478 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssuesController < ApplicationController
-  layout 'base', :except => :export_pdf
-  before_filter :find_project, :authorize
+  menu_item :new_issue, :only => :new
+  
+  before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
+  before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
+  before_filter :find_project, :only => [:new, :update_form, :preview]
+  before_filter :authorize, :except => [:index, :changes, :gantt, :calendar, :preview, :update_form, :context_menu]
+  before_filter :find_optional_project, :only => [:index, :changes, :gantt, :calendar]
+  accept_key_auth :index, :changes
 
+  helper :journals
+  helper :projects
+  include ProjectsHelper   
   helper :custom_fields
   include CustomFieldsHelper
   helper :ifpdf
   include IfpdfHelper
+  helper :issue_relations
+  include IssueRelationsHelper
+  helper :watchers
+  include WatchersHelper
+  helper :attachments
+  include AttachmentsHelper
+  helper :queries
+  helper :sort
+  include SortHelper
+  include IssuesHelper
+  helper :timelog
 
-  def show
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-    @journals_count = @issue.journals.count
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :limit => 15, :order => "#{Journal.table_name}.created_on desc")
-  end
-  
-  def history
-    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on desc")
-    @journals_count = @journals.length  
-  end
-  
-  def export_pdf
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field)
-    @options_for_rfpdf ||= {}
-    @options_for_rfpdf[:file_name] = "#{@project.name}_#{@issue.long_id}.pdf"
-  end
-
-  def edit
-    @priorities = Enumeration::get_values('IPRI')
-    if request.get?
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-    else
-      begin
-        @issue.init_journal(self.logged_in_user)
-        # Retrieve custom fields and values
-        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-        @issue.custom_values = @custom_values
-        @issue.attributes = params[:issue]
-        if @issue.save
-          flash[:notice] = l(:notice_successful_update)
-          redirect_to :action => 'show', :id => @issue
-        end
-      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
-        flash[:notice] = l(:notice_locking_conflict)
+  def index
+    sort_init "#{Issue.table_name}.id", "desc"
+    sort_update
+    retrieve_query
+    if @query.valid?
+      limit = per_page_option
+      respond_to do |format|
+        format.html { }
+        format.atom { }
+        format.csv  { limit = Setting.issues_export_limit.to_i }
+        format.pdf  { limit = Setting.issues_export_limit.to_i }
       end
-    end		
+      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
+      @issue_pages = Paginator.new self, @issue_count, limit, params['page']
+      @issues = Issue.find :all, :order => sort_clause,
+                           :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
+                           :conditions => @query.statement,
+                           :limit  =>  limit,
+                           :offset =>  @issue_pages.current.offset
+      respond_to do |format|
+        format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
+        format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
+        format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
+        format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
+      end
+    else
+      # Send html if the query is not valid
+      render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
   
-  def add_note
-    unless params[:notes].empty?
-      journal = @issue.init_journal(self.logged_in_user, params[:notes])
+  def changes
+    sort_init "#{Issue.table_name}.id", "desc"
+    sort_update
+    retrieve_query
+    if @query.valid?
+      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
+                                     :conditions => @query.statement,
+                                     :limit => 25,
+                                     :order => "#{Journal.table_name}.created_on DESC"
+    end
+    @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
+    render :layout => false, :content_type => 'application/atom+xml'
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def show
+    @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+    @journals.each_with_index {|j,i| j.indice = i+1}
+    @journals.reverse! if User.current.wants_comments_in_reverse_order?
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
+    @priorities = Enumeration::get_values('IPRI')
+    @time_entry = TimeEntry.new
+    respond_to do |format|
+      format.html { render :template => 'issues/show.rhtml' }
+      format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
+      format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
+    end
+  end
+
+  # Add a new issue
+  # The new issue will be created from an existing one if copy_from parameter is given
+  def new
+    @issue = Issue.new
+    @issue.copy_from(params[:copy_from]) if params[:copy_from]
+    @issue.project = @project
+    # Tracker must be set before custom field values
+    @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
+    if @issue.tracker.nil?
+      flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
+      render :nothing => true, :layout => true
+      return
+    end
+    @issue.attributes = params[:issue]
+    @issue.author = User.current
+    
+    default_status = IssueStatus.default
+    unless default_status
+      flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
+      render :nothing => true, :layout => true
+      return
+    end    
+    @issue.status = default_status
+    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
+    
+    if request.get? || request.xhr?
+      @issue.start_date ||= Date.today
+    else
+      requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
+      # Check that the user is allowed to apply the requested status
+      @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
       if @issue.save
-        flash[:notice] = l(:notice_successful_update)
-        Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-        redirect_to :action => 'show', :id => @issue
+        attach_files(@issue, params[:attachments])
+        flash[:notice] = l(:notice_successful_create)
+        Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+        redirect_to :controller => 'issues', :action => 'show', :id => @issue
+        return
+      end		
+    end	
+    @priorities = Enumeration::get_values('IPRI')
+    render :layout => !request.xhr?
+  end
+  
+  # Attributes that can be updated on workflow transition (without :edit permission)
+  # TODO: make it configurable (at least per role)
+  UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
+  
+  def edit
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    @priorities = Enumeration::get_values('IPRI')
+    @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
+    @time_entry = TimeEntry.new
+    
+    @notes = params[:notes]
+    journal = @issue.init_journal(User.current, @notes)
+    # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
+    if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
+      attrs = params[:issue].dup
+      attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
+      attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
+      @issue.attributes = attrs
+    end
+
+    if request.post?
+      @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
+      @time_entry.attributes = params[:time_entry]
+      attachments = attach_files(@issue, params[:attachments])
+      attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
+      
+      call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => journal})
+
+      if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
+        # Log spend time
+        if current_role.allowed_to?(:log_time)
+          @time_entry.save
+        end
+        if !journal.new_record?
+          # Only send notification if something was actually changed
+          flash[:notice] = l(:notice_successful_update)
+          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+        end
+        redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
+      end
+    end
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash.now[:error] = l(:notice_locking_conflict)
+  end
+
+  def reply
+    journal = Journal.find(params[:journal_id]) if params[:journal_id]
+    if journal
+      user = journal.user
+      text = journal.notes
+    else
+      user = @issue.author
+      text = @issue.description
+    end
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
+    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
+    render(:update) { |page|
+      page.<< "$('notes').value = \"#{content}\";"
+      page.show 'update'
+      page << "Form.Element.focus('notes');"
+      page << "Element.scrollTo('update');"
+      page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
+    }
+  end
+  
+  # Bulk edit a set of issues
+  def bulk_edit
+    if request.post?
+      status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
+      priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
+      assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
+      category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
+      fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
+      
+      unsaved_issue_ids = []      
+      @issues.each do |issue|
+        journal = issue.init_journal(User.current, params[:notes])
+        issue.priority = priority if priority
+        issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
+        issue.category = category if category || params[:category_id] == 'none'
+        issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
+        issue.start_date = params[:start_date] unless params[:start_date].blank?
+        issue.due_date = params[:due_date] unless params[:due_date].blank?
+        issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
+        call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
+        # Don't save any change to the issue if the user is not authorized to apply the requested status
+        if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
+          # Send notification for each issue (if changed)
+          Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
+        else
+          # Keep unsaved issue ids to display them in flash error
+          unsaved_issue_ids << issue.id
+        end
+      end
+      if unsaved_issue_ids.empty?
+        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
+      else
+        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+      end
+      redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
+      return
+    end
+    # Find potential statuses the user could be allowed to switch issues to
+    @available_statuses = Workflow.find(:all, :include => :new_status,
+                                              :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq.sort
+  end
+
+  def move
+    @allowed_projects = []
+    # find projects to which the user is allowed to move the issue
+    if User.current.admin?
+      # admin is allowed to move issues to any active (visible) project
+      @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
+    else
+      User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
+    end
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    if request.post?
+      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
+      unsaved_issue_ids = []
+      @issues.each do |issue|
+        issue.init_journal(User.current)
+        unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
+      end
+      if unsaved_issue_ids.empty?
+        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
+      else
+        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+      end
+      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      return
+    end
+    render :layout => false if request.xhr?
+  end
+  
+  def destroy
+    @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
+    if @hours > 0
+      case params[:todo]
+      when 'destroy'
+        # nothing to do
+      when 'nullify'
+        TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
+      when 'reassign'
+        reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
+        if reassign_to.nil?
+          flash.now[:error] = l(:error_issue_not_found_in_project)
+          return
+        else
+          TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
+        end
+      else
+        # display the destroy form
         return
       end
     end
-    show
-    render :action => 'show'
-  end
-
-  def change_status
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
-    @new_status = IssueStatus.find(params[:new_status_id])
-    if params[:confirm]
-      begin
-        journal = @issue.init_journal(self.logged_in_user, params[:notes])
-        @issue.status = @new_status
-        if @issue.update_attributes(params[:issue])
-          # Save attachments
-          params[:attachments].each { |file|
-            next unless file.size > 0
-            a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)            
-            journal.details << JournalDetail.new(:property => 'attachment',
-                                                 :prop_key => a.id,
-                                                 :value => a.filename) unless a.new_record?
-          } if params[:attachments] and params[:attachments].is_a? Array
-        
-          flash[:notice] = l(:notice_successful_update)
-          Mailer.deliver_issue_edit(journal) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-          redirect_to :action => 'show', :id => @issue
-        end
-      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
-        flash[:notice] = l(:notice_locking_conflict)
-      end
-    end    
-    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
-  end
-
-  def destroy
-    @issue.destroy
-    redirect_to :controller => 'projects', :action => 'list_issues', :id => @project
-  end
-
-  def add_attachment
-    # Save the attachments
-    @attachments = []
-    journal = @issue.init_journal(self.logged_in_user)
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
-      @attachments << a unless a.new_record?
-      journal.details << JournalDetail.new(:property => 'attachment',
-                                           :prop_key => a.id,
-                                           :value => a.filename) unless a.new_record?
-    } if params[:attachments] and params[:attachments].is_a? Array
-    journal.save if journal.details.any?
-    Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-    redirect_to :action => 'show', :id => @issue
+    @issues.each(&:destroy)
+    redirect_to :action => 'index', :project_id => @project
   end
 
   def destroy_attachment
     a = @issue.attachments.find(params[:attachment_id])
     a.destroy
-    journal = @issue.init_journal(self.logged_in_user)
+    journal = @issue.init_journal(User.current)
     journal.details << JournalDetail.new(:property => 'attachment',
                                          :prop_key => a.id,
                                          :old_value => a.filename)
     journal.save
     redirect_to :action => 'show', :id => @issue
   end
+  
+  def gantt
+    @gantt = Redmine::Helpers::Gantt.new(params)
+    retrieve_query
+    if @query.valid?
+      events = []
+      # Issues that have start and due dates
+      events += Issue.find(:all, 
+                           :order => "start_date, due_date",
+                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
+                           :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
+                           )
+      # Issues that don't have a due date but that are assigned to a version with a date
+      events += Issue.find(:all, 
+                           :order => "start_date, effective_date",
+                           :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version], 
+                           :conditions => ["(#{@query.statement}) AND (((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_date is not null)", @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to, @gantt.date_from, @gantt.date_to]
+                           )
+      # Versions
+      events += Version.find(:all, :include => :project,
+                                   :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @gantt.date_from, @gantt.date_to])
+                                   
+      @gantt.events = events
+    end
+    
+    respond_to do |format|
+      format.html { render :template => "issues/gantt.rhtml", :layout => !request.xhr? }
+      format.png  { send_data(@gantt.to_image, :disposition => 'inline', :type => 'image/png', :filename => "#{@project.identifier}-gantt.png") } if @gantt.respond_to?('to_image')
+      format.pdf  { send_data(render(:template => "issues/gantt.rfpdf", :layout => false), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
+    end
+  end
+  
+  def calendar
+    if params[:year] and params[:year].to_i > 1900
+      @year = params[:year].to_i
+      if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
+        @month = params[:month].to_i
+      end    
+    end
+    @year ||= Date.today.year
+    @month ||= Date.today.month
+    
+    @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
+    retrieve_query
+    if @query.valid?
+      events = []
+      events += Issue.find(:all, 
+                           :include => [:tracker, :status, :assigned_to, :priority, :project], 
+                           :conditions => ["(#{@query.statement}) AND ((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
+                           )
+      events += Version.find(:all, :include => :project,
+                                   :conditions => ["(#{@query.project_statement}) AND effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
+                                     
+      @calendar.events = events
+    end
+    
+    render :layout => false if request.xhr?
+  end
+  
+  def context_menu
+    @issues = Issue.find_all_by_id(params[:ids], :include => :project)
+    if (@issues.size == 1)
+      @issue = @issues.first
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    end
+    projects = @issues.collect(&:project).compact.uniq
+    @project = projects.first if projects.size == 1
 
-  # Send the file in stream mode
-  def download
-    @attachment = @issue.attachments.find(params[:attachment_id])
-    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
-    render_404
+    @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
+            :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
+            :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
+            :move => (@project && User.current.allowed_to?(:move_issues, @project)),
+            :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
+            :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
+            }
+    if @project
+      @assignables = @project.assignable_users
+      @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
+    end
+    
+    @priorities = Enumeration.get_values('IPRI').reverse
+    @statuses = IssueStatus.find(:all, :order => 'position')
+    @back = request.env['HTTP_REFERER']
+    
+    render :layout => false
   end
 
+  def update_form
+    @issue = Issue.new(params[:issue])
+    render :action => :new, :layout => false
+  end
+  
+  def preview
+    @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
+    @attachements = @issue.attachments if @issue
+    @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
+    render :partial => 'common/preview'
+  end
+  
 private
-  def find_project
+  def find_issue
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
     @project = @issue.project
-    @html_title = "#{@project.name} - #{@issue.tracker.name} ##{@issue.id}"
   rescue ActiveRecord::RecordNotFound
     render_404
-  end  
+  end
+  
+  # Filter for bulk operations
+  def find_issues
+    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
+    raise ActiveRecord::RecordNotFound if @issues.empty?
+    projects = @issues.collect(&:project).compact.uniq
+    if projects.size == 1
+      @project = projects.first
+    else
+      # TODO: let users bulk edit/move/destroy issues from different projects
+      render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_optional_project
+    @project = Project.find(params[:project_id]) unless params[:project_id].blank?
+    allowed = User.current.allowed_to?({:controller => params[:controller], :action => params[:action]}, @project, :global => true)
+    allowed ? true : deny_access
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  # Retrieve query from session or build a new query
+  def retrieve_query
+    if !params[:query_id].blank?
+      cond = "project_id IS NULL"
+      cond << " OR project_id = #{@project.id}" if @project
+      @query = Query.find(params[:query_id], :conditions => cond)
+      @query.project = @project
+      session[:query] = {:id => @query.id, :project_id => @query.project_id}
+    else
+      if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
+        # Give it a name, required to be valid
+        @query = Query.new(:name => "_")
+        @query.project = @project
+        if params[:fields] and params[:fields].is_a? Array
+          params[:fields].each do |field|
+            @query.add_filter(field, params[:operators][field], params[:values][field])
+          end
+        else
+          @query.available_filters.keys.each do |field|
+            @query.add_short_filter(field, params[field]) if params[field]
+          end
+        end
+        session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
+      else
+        @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
+        @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
+        @query.project = @project
+      end
+    end
+  end
 end

app/controllers/journals_controller.rb

@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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.
+
+class JournalsController < ApplicationController
+  before_filter :find_journal
+  
+  def edit
+    if request.post?
+      @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+      @journal.destroy if @journal.details.empty? && @journal.notes.blank?
+      respond_to do |format|
+        format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
+        format.js { render :action => 'update' }
+      end
+    end
+  end
+  
+private
+  def find_journal
+    @journal = Journal.find(params[:id])
+    render_403 and return false unless @journal.editable_by?(User.current)
+    @project = @journal.journalized.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/mail_handler_controller.rb

@@ -0,0 +1,44 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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.
+
+class MailHandlerController < ActionController::Base
+  before_filter :check_credential
+  
+  verify :method => :post,
+         :only => :index,
+         :render => { :nothing => true, :status => 405 }
+         
+  # Submits an incoming email to MailHandler
+  def index
+    options = params.dup
+    email = options.delete(:email)
+    if MailHandler.receive(email, options)
+      render :nothing => true, :status => :created
+    else
+      render :nothing => true, :status => :unprocessable_entity
+    end
+  end
+  
+  private
+  
+  def check_credential
+    User.current = nil
+    unless Setting.mail_handler_api_enabled? && params[:key] == Setting.mail_handler_api_key
+      render :nothing => true, :status => 403
+    end
+  end
+end

app/controllers/members_controller.rb

@@ -16,24 +16,43 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MembersController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_member, :except => :new
+  before_filter :find_project, :only => :new
+  before_filter :authorize
 
+  def new
+    @project.members << Member.new(params[:member]) if request.post?
+    respond_to do |format|
+      format.html { redirect_to :action => 'settings', :tab => 'members', :id => @project }
+      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+    end
+  end
+  
   def edit
     if request.post? and @member.update_attributes(params[:member])
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
+  	 respond_to do |format|
+        format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+        format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+      end
     end
   end
 
   def destroy
     @member.destroy
-    flash[:notice] = l(:notice_successful_delete)
-    redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project
+	respond_to do |format|
+      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'members', :id => @project }
+      format.js { render(:update) {|page| page.replace_html "tab-content-members", :partial => 'projects/settings/members'} }
+    end
   end
 
 private
   def find_project
+    @project = Project.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_member
     @member = Member.find(params[:id]) 
     @project = @member.project
   rescue ActiveRecord::RecordNotFound

app/controllers/messages_controller.rb

@@ -0,0 +1,125 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class MessagesController < ApplicationController
+  menu_item :boards
+  before_filter :find_board, :only => [:new, :preview]
+  before_filter :find_message, :except => [:new, :preview]
+  before_filter :authorize, :except => [:preview, :edit, :destroy]
+
+  verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
+  verify :xhr => true, :only => :quote
+
+  helper :watchers
+  helper :attachments
+  include AttachmentsHelper   
+
+  # Show a topic and its replies
+  def show
+    @replies = @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}])
+    @replies.reverse! if User.current.wants_comments_in_reverse_order?
+    @reply = Message.new(:subject => "RE: #{@message.subject}")
+    render :action => "show", :layout => false if request.xhr?
+  end
+  
+  # Create a new topic
+  def new
+    @message = Message.new(params[:message])
+    @message.author = User.current
+    @message.board = @board
+    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
+      @message.locked = params[:message]['locked']
+      @message.sticky = params[:message]['sticky']
+    end
+    if request.post? && @message.save
+      attach_files(@message, params[:attachments])
+      redirect_to :action => 'show', :id => @message
+    end
+  end
+
+  # Reply to a topic
+  def reply
+    @reply = Message.new(params[:reply])
+    @reply.author = User.current
+    @reply.board = @board
+    @topic.children << @reply
+    if !@reply.new_record?
+      attach_files(@reply, params[:attachments])
+    end
+    redirect_to :action => 'show', :id => @topic
+  end
+
+  # Edit a message
+  def edit
+    render_403 and return false unless @message.editable_by?(User.current)
+    if params[:message]
+      @message.locked = params[:message]['locked']
+      @message.sticky = params[:message]['sticky']
+    end
+    if request.post? && @message.update_attributes(params[:message])
+      attach_files(@message, params[:attachments])
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'show', :id => @topic
+    end
+  end
+  
+  # Delete a messages
+  def destroy
+    render_403 and return false unless @message.destroyable_by?(User.current)
+    @message.destroy
+    redirect_to @message.parent.nil? ?
+      { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
+      { :action => 'show', :id => @message.parent }
+  end
+  
+  def quote
+    user = @message.author
+    text = @message.content
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
+    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
+    render(:update) { |page|
+      page.<< "$('message_content').value = \"#{content}\";"
+      page.show 'reply'
+      page << "Form.Element.focus('message_content');"
+      page << "Element.scrollTo('reply');"
+      page << "$('message_content').scrollTop = $('message_content').scrollHeight - $('message_content').clientHeight;"
+    }
+  end
+  
+  def preview
+    message = @board.messages.find_by_id(params[:id])
+    @attachements = message.attachments if message
+    @text = (params[:message] || params[:reply])[:content]
+    render :partial => 'common/preview'
+  end
+  
+private
+  def find_message
+    find_board
+    @message = @board.messages.find(params[:id], :include => :parent)
+    @topic = @message.root
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_board
+    @board = Board.find(params[:board_id], :include => :project)
+    @project = @board.project
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/my_controller.rb

@@ -16,14 +16,17 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MyController < ApplicationController
-  layout 'base'
   before_filter :require_login
 
+  helper :issues
+
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
+             'issueswatched' => :label_watched_issues,
              'news' => :label_news_latest,
              'calendar' => :label_calendar,
-             'documents' => :label_document_plural
+             'documents' => :label_document_plural,
+             'timelog' => :label_spent_time
            }.freeze
 
   DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'], 
@@ -41,44 +44,65 @@ class MyController < ApplicationController
 
   # Show user's page
   def page
-    @user = self.logged_in_user
+    @user = User.current
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
   end
 
   # Edit user's account
   def account
-    @user = self.logged_in_user
+    @user = User.current
     @pref = @user.pref
-    @user.attributes = params[:user]
-    @user.pref.attributes = params[:pref]
-    if request.post? and @user.save and @user.pref.save
-      set_localization
-      flash.now[:notice] = l(:notice_account_updated)
-      self.logged_in_user.reload
-    end
-  end
-
-  # Change user's password
-  def change_password
-    @user = self.logged_in_user
-    flash[:notice] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
-    if @user.check_password?(params[:password])
-      @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
+    if request.post?
+      @user.attributes = params[:user]
+      @user.mail_notification = (params[:notification_option] == 'all')
+      @user.pref.attributes = params[:pref]
+      @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
       if @user.save
-        flash[:notice] = l(:notice_account_password_updated)
-      else
-        render :action => 'account'
+        @user.pref.save
+        @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
+        set_language_if_valid @user.language
+        flash[:notice] = l(:notice_account_updated)
+        redirect_to :action => 'account'
         return
       end
-    else
-      flash[:notice] = l(:notice_account_wrong_password)
+    end
+    @notification_options = [[l(:label_user_mail_option_all), 'all'],
+                             [l(:label_user_mail_option_none), 'none']]
+    # Only users that belong to more than 1 project can select projects for which they are notified
+    # Note that @user.membership.size would fail since AR ignores :include association option when doing a count
+    @notification_options.insert 1, [l(:label_user_mail_option_selected), 'selected'] if @user.memberships.length > 1
+    @notification_option = @user.mail_notification? ? 'all' : (@user.notified_projects_ids.empty? ? 'none' : 'selected')    
+  end
+
+  # Manage user's password
+  def password
+    @user = User.current
+    flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
+    if request.post?
+      if @user.check_password?(params[:password])
+        @user.password, @user.password_confirmation = params[:new_password], params[:new_password_confirmation]
+        if @user.save
+          flash[:notice] = l(:notice_account_password_updated)
+          redirect_to :action => 'account'
+        end
+      else
+        flash[:error] = l(:notice_account_wrong_password)
+      end
+    end
+  end
+  
+  # Create a new feeds key
+  def reset_rss_key
+    if request.post? && User.current.rss_token
+      User.current.rss_token.destroy
+      flash[:notice] = l(:notice_feeds_access_key_reseted)
     end
     redirect_to :action => 'account'
   end
 
   # User's page layout configuration
   def page_layout
-    @user = self.logged_in_user
+    @user = User.current
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
     session[:page_layout] = @blocks
     %w(top left right).each {|f| session[:page_layout][f] ||= [] }
@@ -92,7 +116,7 @@ class MyController < ApplicationController
   def add_block
     block = params[:block]
     render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
-    @user = self.logged_in_user
+    @user = User.current
     # remove if already present in a group
     %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
     # add it on top
@@ -127,7 +151,7 @@ class MyController < ApplicationController
   
   # Save user's page layout  
   def page_layout_save
-    @user = self.logged_in_user
+    @user = User.current
     @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
     @user.pref.save
     session[:page_layout] = nil

app/controllers/news_controller.rb

@@ -16,12 +16,41 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NewsController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize
-
+  before_filter :find_news, :except => [:new, :index, :preview]
+  before_filter :find_project, :only => [:new, :preview]
+  before_filter :authorize, :except => [:index, :preview]
+  before_filter :find_optional_project, :only => :index
+  accept_key_auth :index
+  
+  def index
+    @news_pages, @newss = paginate :news,
+                                   :per_page => 10,
+                                   :conditions => (@project ? {:project_id => @project.id} : Project.visible_by(User.current)),
+                                   :include => [:author, :project],
+                                   :order => "#{News.table_name}.created_on DESC"    
+    respond_to do |format|
+      format.html { render :layout => false if request.xhr? }
+      format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
+    end
+  end
+  
   def show
+    @comments = @news.comments
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?
   end
 
+  def new
+    @news = News.new(:project => @project, :author => User.current)
+    if request.post?
+      @news.attributes = params[:news]
+      if @news.save
+        flash[:notice] = l(:notice_successful_create)
+        Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
+        redirect_to :controller => 'news', :action => 'index', :project_id => @project
+      end
+    end
+  end
+  
   def edit
     if request.post? and @news.update_attributes(params[:news])
       flash[:notice] = l(:notice_successful_update)
@@ -31,7 +60,7 @@ class NewsController < ApplicationController
   
   def add_comment
     @comment = Comment.new(params[:comment])
-    @comment.author = logged_in_user
+    @comment.author = User.current
     if @news.comments << @comment
       flash[:notice] = l(:label_comment_added)
       redirect_to :action => 'show', :id => @news
@@ -47,14 +76,33 @@ class NewsController < ApplicationController
 
   def destroy
     @news.destroy
-    redirect_to :controller => 'projects', :action => 'list_news', :id => @project
+    redirect_to :action => 'index', :project_id => @project
+  end
+  
+  def preview
+    @text = (params[:news] ? params[:news][:description] : nil)
+    render :partial => 'common/preview'
   end
   
 private
-  def find_project
+  def find_news
     @news = News.find(params[:id])
     @project = @news.project
   rescue ActiveRecord::RecordNotFound
     render_404
-  end  
+  end
+  
+  def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_optional_project
+    return true unless params[:project_id]
+    @project = Project.find(params[:project_id])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
 end

app/controllers/projects_controller.rb

@@ -15,64 +15,66 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'csv'
-
 class ProjectsController < ApplicationController
-  layout 'base'
-  before_filter :find_project, :authorize, :except => [ :index, :list, :add ]
-  before_filter :require_admin, :only => [ :add, :destroy ]
-
+  menu_item :overview
+  menu_item :activity, :only => :activity
+  menu_item :roadmap, :only => :roadmap
+  menu_item :files, :only => [:list_files, :add_file]
+  menu_item :settings, :only => :settings
+  menu_item :issues, :only => [:changelog]
+  
+  before_filter :find_project, :except => [ :index, :list, :add, :activity ]
+  before_filter :find_optional_project, :only => :activity
+  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
+  before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
+  accept_key_auth :activity
+  
   helper :sort
   include SortHelper
   helper :custom_fields
   include CustomFieldsHelper   
   helper :ifpdf
   include IfpdfHelper
+  helper :issues
   helper IssuesHelper
   helper :queries
   include QueriesHelper
+  helper :repositories
+  include RepositoriesHelper
+  include ProjectsHelper
   
+  # Lists visible projects
   def index
-    list
-    render :action => 'list' unless request.xhr?
+    projects = Project.find :all,
+                            :conditions => Project.visible_by(User.current),
+                            :include => :parent
+    respond_to do |format|
+      format.html { 
+        @project_tree = projects.group_by {|p| p.parent || p}
+        @project_tree.keys.each {|p| @project_tree[p] -= [p]} 
+      }
+      format.atom {
+        render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 
+                                  :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
+      }
+    end
   end
-
-  # Lists public projects
-  def list
-    sort_init "#{Project.table_name}.name", "asc"
-    sort_update		
-    @project_count = Project.count(:all, :conditions => ["is_public=?", true])		
-    @project_pages = Paginator.new self, @project_count,
-								15,
-								params['page']								
-    @projects = Project.find :all, :order => sort_clause,
-						:conditions => ["#{Project.table_name}.is_public=?", true],
-						:include => :parent,
-						:limit  =>  @project_pages.items_per_page,
-						:offset =>  @project_pages.current.offset
-
-    render :action => "list", :layout => false if request.xhr?	
-  end
-          
+  
   # Add a new project
   def add
-    @custom_fields = IssueCustomField.find(:all)
-    @root_projects = Project.find(:all, :conditions => "parent_id is null")
+    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+    @trackers = Tracker.all
+    @root_projects = Project.find(:all,
+                                  :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
+                                  :order => 'name')
     @project = Project.new(params[:project])
     if request.get?
-      @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
+      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
+      @project.trackers = Tracker.all
+      @project.is_public = Setting.default_projects_public?
+      @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     else
-      @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
-      @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
-      @project.custom_values = @custom_values			
-      if params[:repository_enabled] && params[:repository_enabled] == "1"
-        @project.repository = Repository.new
-        @project.repository.attributes = params[:repository]
-      end
-      if "1" == params[:wiki_enabled]
-        @project.wiki = Wiki.new
-        @project.wiki.attributes = params[:wiki]
-      end
+      @project.enabled_module_names = params[:enabled_modules]
       if @project.save
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'admin', :action => 'projects'
@@ -82,51 +84,43 @@ class ProjectsController < ApplicationController
 	
   # Show @project
   def show
-    @custom_values = @project.custom_values.find(:all, :include => :custom_field)
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
-    @subprojects = @project.children if @project.children.size > 0
+    @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
-    @trackers = Tracker.find(:all, :order => 'position')
-    @open_issues_by_tracker = Issue.count(:group => :tracker, :joins => "INNER JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{Issue.table_name}.status_id", :conditions => ["project_id=? and #{IssueStatus.table_name}.is_closed=?", @project.id, false])
-    @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
+    @trackers = @project.rolled_up_trackers
+    
+    cond = @project.project_condition(Setting.display_subprojects_issues?)
+    Issue.visible_by(User.current) do
+      @open_issues_by_tracker = Issue.count(:group => :tracker,
+                                            :include => [:project, :status, :tracker],
+                                            :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
+      @total_issues_by_tracker = Issue.count(:group => :tracker,
+                                            :include => [:project, :status, :tracker],
+                                            :conditions => cond)
+    end
+    TimeEntry.visible_by(User.current) do
+      @total_hours = TimeEntry.sum(:hours, 
+                                   :include => :project,
+                                   :conditions => cond).to_f
+    end
+    @key = User.current.rss_key
   end
 
   def settings
-    @root_projects = Project::find(:all, :conditions => ["parent_id is null and id <> ?", @project.id])
-    @custom_fields = IssueCustomField.find(:all)
+    @root_projects = Project.find(:all,
+                                  :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
+                                  :order => 'name')
+    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
-    @roles = Role.find(:all, :order => 'position')
-    @users = User.find_active(:all) - @project.users
-    @custom_values ||= ProjectCustomField.find(:all).collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
+    @trackers = Tracker.all
+    @repository ||= @project.repository
+    @wiki ||= @project.wiki
   end
   
   # Edit @project
   def edit
     if request.post?
-      @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
-      if params[:custom_fields]
-        @custom_values = ProjectCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
-        @project.custom_values = @custom_values
-      end
-      if params[:repository_enabled]
-        case params[:repository_enabled]
-        when "0"
-          @project.repository = nil
-        when "1"
-          @project.repository ||= Repository.new
-          @project.repository.update_attributes params[:repository]
-        end
-      end
-      if params[:wiki_enabled]
-        case params[:wiki_enabled]
-        when "0"
-          @project.wiki.destroy if @project.wiki
-        when "1"
-          @project.wiki ||= Wiki.new
-          @project.wiki.update_attributes params[:wiki]
-        end
-      end      
       @project.attributes = params[:project]
       if @project.save
         flash[:notice] = l(:notice_successful_update)
@@ -137,28 +131,51 @@ class ProjectsController < ApplicationController
       end
     end
   end
+  
+  def modules
+    @project.enabled_module_names = params[:enabled_modules]
+    redirect_to :action => 'settings', :id => @project, :tab => 'modules'
+  end
 
+  def archive
+    @project.archive if request.post? && @project.active?
+    redirect_to :controller => 'admin', :action => 'projects'
+  end
+  
+  def unarchive
+    @project.unarchive if request.post? && !@project.active?
+    redirect_to :controller => 'admin', :action => 'projects'
+  end
+  
   # Delete @project
   def destroy
+    @project_to_destroy = @project
     if request.post? and params[:confirm]
-      @project.destroy
+      @project_to_destroy.destroy
       redirect_to :controller => 'admin', :action => 'projects'
     end
+    # hide project in layout
+    @project = nil
   end
 	
   # Add a new issue category to @project
   def add_issue_category
-    if request.post?
-      @issue_category = @project.issue_categories.build(params[:issue_category])
-      if @issue_category.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'settings', :tab => 'categories', :id => @project
-      else
-        settings
-        render :action => 'settings'
+    @category = @project.issue_categories.build(params[:category])
+    if request.post? and @category.save
+  	  respond_to do |format|
+        format.html do
+          flash[:notice] = l(:notice_successful_create)
+          redirect_to :action => 'settings', :tab => 'categories', :id => @project
+        end
+        format.js do
+          # IE doesn't support the replace_html rjs method for select box options
+          render(:update) {|page| page.replace "issue_category_id",
+            content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
+          }
+        end
       end
     end
-  end	
+  end
 	
   # Add a new version to @project
   def add_version
@@ -169,479 +186,75 @@ class ProjectsController < ApplicationController
   	end
   end
 
-  # Add a new member to @project
-  def add_member
-    @member = @project.members.build(params[:member])
-  	if request.post?
-      if @member.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'settings', :tab => 'members', :id => @project
-      else		
-        settings
-        render :action => 'settings'
-      end
-    end
-  end
-
-  # Show members list of @project
-  def list_members
-    @members = @project.members.find(:all)
-  end
-
-  # Add a new document to @project
-  def add_document
-    @categories = Enumeration::get_values('DCAT')
-    @document = @project.documents.build(params[:document])    
-    if request.post? and @document.save	
-      # Save the attachments
-      params[:attachments].each { |a|
-        Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
-      } if params[:attachments] and params[:attachments].is_a? Array
-      flash[:notice] = l(:notice_successful_create)
-      Mailer.deliver_document_add(@document) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-      redirect_to :action => 'list_documents', :id => @project
-    end
-  end
-  
-  # Show documents list of @project
-  def list_documents
-    @documents = @project.documents.find :all, :include => :category
-  end
-
-  # Add a new issue to @project
-  def add_issue
-    @tracker = Tracker.find(params[:tracker_id])
-    @priorities = Enumeration::get_values('IPRI')
-    
-    default_status = IssueStatus.default
-    @issue = Issue.new(:project => @project, :tracker => @tracker)    
-    @issue.status = default_status
-    @allowed_statuses = default_status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
-    if request.get?
-      @issue.start_date = Date.today
-      @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) }
-    else
-      @issue.attributes = params[:issue]
-      
-      requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
-      @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
-      
-      @issue.author_id = self.logged_in_user.id if self.logged_in_user
-      # Multiple file upload
-      @attachments = []
-      params[:attachments].each { |a|
-        @attachments << Attachment.new(:container => @issue, :file => a, :author => logged_in_user) unless a.size == 0
-      } if params[:attachments] and params[:attachments].is_a? Array
-      @custom_values = @project.custom_fields_for_issues(@tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-      @issue.custom_values = @custom_values
-      if @issue.save
-        @attachments.each(&:save)
-        flash[:notice] = l(:notice_successful_create)
-        Mailer.deliver_issue_add(@issue) if Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
-        redirect_to :action => 'list_issues', :id => @project
-      end		
-    end	
-  end
-
-  # Show filtered/sorted issues list of @project
-  def list_issues
-    sort_init "#{Issue.table_name}.id", "desc"
-    sort_update
-
-    retrieve_query
-
-    @results_per_page_options = [ 15, 25, 50, 100 ]
-    if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
-      @results_per_page = params[:per_page].to_i
-      session[:results_per_page] = @results_per_page
-    else
-      @results_per_page = session[:results_per_page] || 25
-    end
-
-    if @query.valid?
-      @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)		
-      @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']								
-      @issues = Issue.find :all, :order => sort_clause,
-  						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
-  						:conditions => @query.statement,
-  						:limit  =>  @issue_pages.items_per_page,
-  						:offset =>  @issue_pages.current.offset						
-    end    
-    @trackers = Tracker.find :all, :order => 'position'
-    render :layout => false if request.xhr?
-  end
-
-  # Export filtered/sorted issues list to CSV
-  def export_issues_csv
-    sort_init "#{Issue.table_name}.id", "desc"
-    sort_update
-
-    retrieve_query
-    render :action => 'list_issues' and return unless @query.valid?
-					
-    @issues =  Issue.find :all, :order => sort_clause,
-						:include => [ :assigned_to, :author, :status, :tracker, :priority, {:custom_values => :custom_field} ],
-						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
-
-    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
-    export = StringIO.new
-    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
-      # csv header fields
-      headers = [ "#", l(:field_status), 
-                       l(:field_tracker),
-                       l(:field_priority),
-                       l(:field_subject),
-                       l(:field_assigned_to),
-                       l(:field_author),
-                       l(:field_start_date),
-                       l(:field_due_date),
-                       l(:field_done_ratio),
-                       l(:field_created_on),
-                       l(:field_updated_on)
-                       ]
-      for custom_field in @project.all_custom_fields
-        headers << custom_field.name
-      end      
-      csv << headers.collect {|c| ic.iconv(c) }
-      # csv lines
-      @issues.each do |issue|
-        fields = [issue.id, issue.status.name, 
-                            issue.tracker.name, 
-                            issue.priority.name,
-                            issue.subject, 
-                            (issue.assigned_to ? issue.assigned_to.name : ""),
-                            issue.author.name,
-                            issue.start_date ? l_date(issue.start_date) : nil,
-                            issue.due_date ? l_date(issue.due_date) : nil,
-                            issue.done_ratio,
-                            l_datetime(issue.created_on),  
-                            l_datetime(issue.updated_on)
-                            ]
-        for custom_field in @project.all_custom_fields
-          fields << (show_value issue.custom_value_for(custom_field))
-        end
-        csv << fields.collect {|c| ic.iconv(c.to_s) }
-      end
-    end
-    export.rewind
-    send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
-  end
-  
-  # Export filtered/sorted issues to PDF
-  def export_issues_pdf
-    sort_init "#{Issue.table_name}.id", "desc"
-    sort_update
-
-    retrieve_query
-    render :action => 'list_issues' and return unless @query.valid?
-					
-    @issues =  Issue.find :all, :order => sort_clause,
-						:include => [ :author, :status, :tracker, :priority ],
-						:conditions => @query.statement,
-						:limit => Setting.issues_export_limit
-											
-    @options_for_rfpdf ||= {}
-    @options_for_rfpdf[:file_name] = "export.pdf"
-    render :layout => false
-  end
-
-  def move_issues
-    @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
-    redirect_to :action => 'list_issues', :id => @project and return unless @issues
-    @projects = []
-    # find projects to which the user is allowed to move the issue
-    @logged_in_user.memberships.each {|m| @projects << m.project if Permission.allowed_to_role("projects/move_issues", m.role)}
-    # issue can be moved to any tracker
-    @trackers = Tracker.find(:all)
-    if request.post? and params[:new_project_id] and params[:new_tracker_id]    
-      new_project = Project.find(params[:new_project_id])
-      new_tracker = Tracker.find(params[:new_tracker_id])
-      @issues.each { |i|
-        # project dependent properties
-        unless i.project_id == new_project.id
-          i.category = nil 
-          i.fixed_version = nil
-        end
-        # move the issue
-        i.project = new_project
-        i.tracker = new_tracker
-        i.save
-      }
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'list_issues', :id => @project
-    end
-  end
-
-  def add_query
-    @query = Query.new(params[:query])
-    @query.project = @project
-    @query.user = logged_in_user
-    
-    params[:fields].each do |field|
-      @query.add_filter(field, params[:operators][field], params[:values][field])
-    end if params[:fields]
-    
-    if request.post? and @query.save
-      flash[:notice] = l(:notice_successful_create)
-      redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
-    end    
-    render :layout => false if request.xhr?
-  end
-
-  # Add a news to @project
-  def add_news
-    @news = News.new(:project => @project)
-    if request.post?
-      @news.attributes = params[:news]
-      @news.author_id = self.logged_in_user.id if self.logged_in_user
-      if @news.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'list_news', :id => @project
-      end
-    end
-  end
-
-  # Show news list of @project
-  def list_news
-    @news_pages, @news = paginate :news, :per_page => 10, :conditions => ["project_id=?", @project.id], :include => :author, :order => "#{News.table_name}.created_on DESC"
-    render :action => "list_news", :layout => false if request.xhr?
-  end
-
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
-      # Save the attachments
-      @attachments = []
-      params[:attachments].each { |file|
-        next unless file.size > 0
-        a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
-        @attachments << a unless a.new_record?
-      } if params[:attachments] and params[:attachments].is_a? Array
-      Mailer.deliver_attachments_add(@attachments) if !@attachments.empty? and Permission.find_by_controller_and_action(params[:controller], params[:action]).mail_enabled?
+      attachments = attach_files(@version, params[:attachments])
+      Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
     end
-    @versions = @project.versions
+    @versions = @project.versions.sort
   end
   
   def list_files
-    @versions = @project.versions
+    sort_init "#{Attachment.table_name}.filename", "asc"
+    sort_update
+    @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+    render :layout => !request.xhr?
   end
   
   # Show changelog for @project
   def changelog
-    @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
-    @fixed_issues = @project.issues.find(:all, 
-      :include => [ :fixed_version, :status, :tracker ], 
-      :conditions => [ "#{IssueStatus.table_name}.is_closed=? and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}) and #{Issue.table_name}.fixed_version_id is not null", true],
-      :order => "#{Version.table_name}.effective_date DESC, #{Issue.table_name}.id DESC"
-    ) unless @selected_tracker_ids.empty?
-    @fixed_issues ||= []
+    @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
+    retrieve_selected_tracker_ids(@trackers)    
+    @versions = @project.versions.sort
   end
 
   def roadmap
-    @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
+    @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
     retrieve_selected_tracker_ids(@trackers)
-    
-    @versions = @project.versions.find(:all,
-      :conditions => [ "#{Version.table_name}.effective_date>?", Date.today],
-      :order => "#{Version.table_name}.effective_date ASC"
-    )
+    @versions = @project.versions.sort
+    @versions = @versions.select {|v| !v.completed? } unless params[:completed]
   end
   
   def activity
-    if params[:year] and params[:year].to_i > 1900
-      @year = params[:year].to_i
-      if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
-        @month = params[:month].to_i
-      end    
+    @days = Setting.activity_days_default.to_i
+    
+    if params[:from]
+      begin; @date_to = params[:from].to_date + 1; rescue; end
     end
-    @year ||= Date.today.year
-    @month ||= Date.today.month
 
-    @date_from = Date.civil(@year, @month, 1)
-    @date_to = (@date_from >> 1)-1
+    @date_to ||= Date.today + 1
+    @date_from = @date_to - @days
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+    @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))
     
-    @events_by_day = {}    
-    
-    unless params[:show_issues] == "0"
-      @project.issues.find(:all, :include => [:author], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] ).each { |i|
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      @show_issues = 1
-    end
-    
-    unless params[:show_news] == "0"
-      @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author ).each { |i|
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      @show_news = 1 
-    end
-    
-    unless params[:show_files] == "0"
-      Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      @show_files = 1 
-    end
-    
-    unless params[:show_documents] == "0"
-      @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] ).each { |i|
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author ).each { |i|
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      @show_documents = 1 
-    end
-    
-    unless params[:show_wiki_edits] == "0"
-      select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comment, " +
-               "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title"
-      joins = "LEFT JOIN #{WikiPage.table_name} ON #{WikiPage.table_name}.id = #{WikiContent.versioned_table_name}.page_id " +
-              "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id "
-      conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
-                    @project.id, @date_from, @date_to]
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, 
+                                                             :with_subprojects => @with_subprojects,
+                                                             :author => @author)
+    @activity.scope_select {|t| !params["show_#{t}"].nil?}
+    @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
 
-      WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions).each { |i|
-        # We provide this alias so all events can be treated in the same manner
-        def i.created_on
-          self.updated_on
+    events = @activity.events(@date_from, @date_to)
+    
+    respond_to do |format|
+      format.html { 
+        @events_by_day = events.group_by(&:event_date)
+        render :layout => false if request.xhr?
+      }
+      format.atom {
+        title = l(:label_activity)
+        if @author
+          title = @author.name
+        elsif @activity.scope.size == 1
+          title = l("label_#{@activity.scope.first.singularize}_plural")
         end
-
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
+        render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
       }
-      @show_wiki_edits = 1
-    end
-
-    unless @project.repository.nil? || params[:show_changesets] == "0"
-      @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to]).each { |i|
-        def i.created_on
-          self.committed_on
-        end
-        @events_by_day[i.created_on.to_date] ||= []
-        @events_by_day[i.created_on.to_date] << i
-      }
-      @show_changesets = 1 
     end
     
-    render :layout => false if request.xhr?
-  end
-  
-  def calendar
-    @trackers = Tracker.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
-    if params[:year] and params[:year].to_i > 1900
-      @year = params[:year].to_i
-      if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
-        @month = params[:month].to_i
-      end    
-    end
-    @year ||= Date.today.year
-    @month ||= Date.today.month
-    
-    @date_from = Date.civil(@year, @month, 1)
-    @date_to = (@date_from >> 1)-1
-    # start on monday
-    @date_from = @date_from - (@date_from.cwday-1)
-    # finish on sunday
-    @date_to = @date_to + (7-@date_to.cwday)        
-    
-    @events = []
-    @project.issues_with_subprojects(params[:with_subprojects]) do
-      @events += Issue.find(:all, 
-                           :include => [:tracker, :status, :assigned_to, :priority], 
-                           :conditions => ["((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?)) and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')})", @date_from, @date_to, @date_from, @date_to]
-                           ) unless @selected_tracker_ids.empty?
-    end
-    @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
-    
-    @ending_events_by_days = @events.group_by {|event| event.due_date}
-    @starting_events_by_days = @events.group_by {|event| event.start_date}
-    
-    render :layout => false if request.xhr?
-  end  
-
-  def gantt
-    @trackers = Tracker.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers)
-    
-    if params[:year] and params[:year].to_i >0
-      @year_from = params[:year].to_i
-      if params[:month] and params[:month].to_i >=1 and params[:month].to_i <= 12
-        @month_from = params[:month].to_i
-      else
-        @month_from = 1
-      end
-    else
-      @month_from ||= (Date.today << 1).month
-      @year_from ||= (Date.today << 1).year
-    end
-    
-    @zoom = (params[:zoom].to_i > 0 and params[:zoom].to_i < 5) ? params[:zoom].to_i : 2
-    @months = (params[:months].to_i > 0 and params[:months].to_i < 25) ? params[:months].to_i : 6
-    
-    @date_from = Date.civil(@year_from, @month_from, 1)
-    @date_to = (@date_from >> @months) - 1
-    
-    @events = []
-    @project.issues_with_subprojects(params[:with_subprojects]) do
-      @events += Issue.find(:all, 
-                           :order => "start_date, due_date",
-                           :include => [:tracker, :status, :assigned_to, :priority], 
-                           :conditions => ["(((start_date>=? and start_date<=?) or (due_date>=? and due_date<=?) or (start_date<? and due_date>?)) and start_date is not null and due_date is not null and #{Issue.table_name}.tracker_id in (#{@selected_tracker_ids.join(',')}))", @date_from, @date_to, @date_from, @date_to, @date_from, @date_to]
-                           ) unless @selected_tracker_ids.empty?
-    end
-    @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
-    @events.sort! {|x,y| x.start_date <=> y.start_date }
-    
-    if params[:output]=='pdf'
-      @options_for_rfpdf ||= {}
-      @options_for_rfpdf[:file_name] = "gantt.pdf"
-      render :template => "projects/gantt.rfpdf", :layout => false
-    else
-      render :template => "projects/gantt.rhtml"
-    end
-  end
-  
-  def search
-    @question = params[:q] || ""
-    @question.strip!
-    @all_words = params[:all_words] || (params[:submit] ? false : true)
-    @scope = params[:scope] || (params[:submit] ? [] : %w(issues changesets news documents wiki) )
-    # tokens must be at least 3 character long
-    @tokens = @question.split.uniq.select {|w| w.length > 2 }
-    if !@tokens.empty?
-      # no more than 5 tokens to search for
-      @tokens.slice! 5..-1 if @tokens.size > 5
-      # strings used in sql like statement
-      like_tokens = @tokens.collect {|w| "%#{w}%"}
-      operator = @all_words ? " AND " : " OR "
-      limit = 10
-      @results = []
-      @results += @project.issues.find(:all, :limit => limit, :include => :author, :conditions => [ (["(LOWER(subject) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'issues'
-      @results += @project.news.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort], :include => :author ) if @scope.include? 'news'
-      @results += @project.documents.find(:all, :limit => limit, :conditions => [ (["(LOWER(title) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @scope.include? 'documents'
-      @results += @project.wiki.pages.find(:all, :limit => limit, :include => :content, :conditions => [ (["(LOWER(title) like ? OR LOWER(text) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort] ) if @project.wiki && @scope.include?('wiki')
-      @results += @project.repository.changesets.find(:all, :limit => limit, :conditions => [ (["(LOWER(comment) like ?)"] * like_tokens.size).join(operator), * (like_tokens).sort] ) if @project.repository && @scope.include?('changesets')
-      @question = @tokens.join(" ")
-    else
-      @question = ""
-    end
-  end
-  
-  def feeds
-    @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
-    @key = logged_in_user.get_or_create_rss_key.value if logged_in_user
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
   
 private
@@ -650,11 +263,18 @@ private
   # Used as a before_filter
   def find_project
     @project = Project.find(params[:id])
-    @html_title = @project.name
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
+  def find_optional_project
+    return true unless params[:id]
+    @project = Project.find(params[:id])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   def retrieve_selected_tracker_ids(selectable_trackers)
     if ids = params[:tracker_ids]
       @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
@@ -662,30 +282,4 @@ private
       @selected_tracker_ids = selectable_trackers.collect {|t| t.id.to_s }
     end
   end
-  
-  # Retrieve query from session or build a new query
-  def retrieve_query
-    if params[:query_id]
-      @query = @project.queries.find(params[:query_id])
-      session[:query] = @query
-    else
-      if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
-        # Give it a name, required to be valid
-        @query = Query.new(:name => "_")
-        @query.project = @project
-        if params[:fields] and params[:fields].is_a? Array
-          params[:fields].each do |field|
-            @query.add_filter(field, params[:operators][field], params[:values][field])
-          end
-        else
-          @query.available_filters.keys.each do |field|
-            @query.add_short_filter(field, params[field]) if params[field]
-          end
-        end
-        session[:query] = @query
-      else
-        @query = session[:query]
-      end
-    end  
-  end
 end

app/controllers/queries_controller.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -16,9 +16,29 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class QueriesController < ApplicationController
-  layout 'base'
-  before_filter :require_login, :find_query
-
+  menu_item :issues
+  before_filter :find_query, :except => :new
+  before_filter :find_optional_project, :only => :new
+  
+  def new
+    @query = Query.new(params[:query])
+    @query.project = params[:query_is_for_all] ? nil : @project
+    @query.user = User.current
+    @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
+    @query.column_names = nil if params[:default_columns]
+    
+    params[:fields].each do |field|
+      @query.add_filter(field, params[:operators][field], params[:values][field])
+    end if params[:fields]
+    
+    if request.post? && params[:confirm] && @query.save
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
+      return
+    end
+    render :layout => false if request.xhr?
+  end
+  
   def edit
     if request.post?
       @query.filters = {}
@@ -26,25 +46,34 @@ class QueriesController < ApplicationController
         @query.add_filter(field, params[:operators][field], params[:values][field])
       end if params[:fields]
       @query.attributes = params[:query]
-          
+      @query.project = nil if params[:query_is_for_all]
+      @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
+      @query.column_names = nil if params[:default_columns]
+      
       if @query.save
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query
+        redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :query_id => @query
       end
     end
   end
 
   def destroy
     @query.destroy if request.post?
-    redirect_to :controller => 'reports', :action => 'issue_report', :id => @project
+    redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1
   end
   
 private
   def find_query
     @query = Query.find(params[:id])
     @project = @query.project
-    # check if user is allowed to manage queries (same permission as add_query)
-    authorize('projects', 'add_query')
+    render_403 unless @query.editable_by?(User.current)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_optional_project
+    @project = Project.find(params[:project_id]) if params[:project_id]
+    User.current.allowed_to?(:save_queries, @project, :global => true)
   rescue ActiveRecord::RecordNotFound
     render_404
   end

app/controllers/reports_controller.rb

@@ -16,7 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ReportsController < ApplicationController
-  layout 'base'
+  menu_item :issues
   before_filter :find_project, :authorize
 
   def issue_report
@@ -25,10 +25,16 @@ class ReportsController < ApplicationController
     case params[:detail]
     when "tracker"
       @field = "tracker_id"
-      @rows = Tracker.find :all, :order => 'position'
+      @rows = @project.trackers
       @data = issues_by_tracker
       @report_title = l(:field_tracker)
       render :template => "reports/issue_report_details"
+    when "version"
+      @field = "fixed_version_id"
+      @rows = @project.versions.sort
+      @data = issues_by_version
+      @report_title = l(:field_version)
+      render :template => "reports/issue_report_details"
     when "priority"
       @field = "priority_id"
       @rows = Enumeration::get_values('IPRI')
@@ -41,6 +47,12 @@ class ReportsController < ApplicationController
       @data = issues_by_category
       @report_title = l(:field_category)
       render :template => "reports/issue_report_details"   
+    when "assigned_to"
+      @field = "assigned_to_id"
+      @rows = @project.members.collect { |m| m.user }
+      @data = issues_by_assigned_to
+      @report_title = l(:field_assigned_to)
+      render :template => "reports/issue_report_details"
     when "author"
       @field = "author_id"
       @rows = @project.members.collect { |m| m.user }
@@ -49,23 +61,26 @@ class ReportsController < ApplicationController
       render :template => "reports/issue_report_details"  
     when "subproject"
       @field = "project_id"
-      @rows = @project.children
+      @rows = @project.active_children
       @data = issues_by_subproject
       @report_title = l(:field_subproject)
       render :template => "reports/issue_report_details"  
     else
-      @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)]
-      @trackers = Tracker.find(:all, :order => 'position')
+      @trackers = @project.trackers
+      @versions = @project.versions.sort
       @priorities = Enumeration::get_values('IPRI')
       @categories = @project.issue_categories
+      @assignees = @project.members.collect { |m| m.user }
       @authors = @project.members.collect { |m| m.user }
-      @subprojects = @project.children
+      @subprojects = @project.active_children
       issues_by_tracker
+      issues_by_version
       issues_by_priority
       issues_by_category
+      issues_by_assigned_to
       issues_by_author
       issues_by_subproject
-      @total_hours = @project.time_entries.sum(:hours)
+      
       render :template => "reports/issue_report"
     end
   end  
@@ -128,7 +143,22 @@ private
                                                   and i.project_id=#{@project.id}
                                                 group by s.id, s.is_closed, t.id")	
   end
-	
+
+  def issues_by_version
+    @issues_by_version ||= 
+        ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
+                                                  v.id as fixed_version_id,
+                                                  count(i.id) as total 
+                                                from 
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{Version.table_name} v
+                                                where 
+                                                  i.status_id=s.id 
+                                                  and i.fixed_version_id=v.id
+                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, v.id")	
+  end
+  	
   def issues_by_priority    
     @issues_by_priority ||= 
       ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
@@ -158,7 +188,22 @@ private
                                                   and i.project_id=#{@project.id}
                                                 group by s.id, s.is_closed, c.id")	
   end
-	
+  
+  def issues_by_assigned_to
+    @issues_by_assigned_to ||= 
+      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
+                                                  a.id as assigned_to_id,
+                                                  count(i.id) as total 
+                                                from 
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
+                                                where 
+                                                  i.status_id=s.id 
+                                                  and i.assigned_to_id=a.id
+                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, a.id")
+  end
+  
   def issues_by_author
     @issues_by_author ||= 
       ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
@@ -184,8 +229,8 @@ private
                                                   #{Issue.table_name} i, #{IssueStatus.table_name} s
                                                 where 
                                                   i.status_id=s.id 
-                                                  and i.project_id IN (#{@project.children.collect{|p| p.id}.join(',')})
-                                                group by s.id, s.is_closed, i.project_id") if @project.children.any?
+                                                  and i.project_id IN (#{@project.active_children.collect{|p| p.id}.join(',')})
+                                                group by s.id, s.is_closed, i.project_id") if @project.active_children.any?
     @issues_by_subproject ||= []
   end
 end

app/controllers/repositories_controller.rb

@@ -17,66 +17,156 @@
 
 require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
+require 'digest/sha1'
+
+class ChangesetNotFound < Exception; end
+class InvalidRevisionParam < Exception; end
 
 class RepositoriesController < ApplicationController
-  layout 'base'
-  before_filter :find_project
-  before_filter :authorize, :except => [:stats, :graph]
-  before_filter :check_project_privacy, :only => [:stats, :graph]
+  menu_item :repository
+  before_filter :find_repository, :except => :edit
+  before_filter :find_project, :only => :edit
+  before_filter :authorize
+  accept_key_auth :revisions
+  
+  rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
+  
+  def edit
+    @repository = @project.repository
+    if !@repository
+      @repository = Repository.factory(params[:repository_scm])
+      @repository.project = @project if @repository
+    end
+    if request.post? && @repository
+      @repository.attributes = params[:repository]
+      @repository.save
+    end
+    render(:update) {|page| page.replace_html "tab-content-repository", :partial => 'projects/settings/repository'}
+  end
+  
+  def committers
+    @committers = @repository.committers
+    @users = @project.users
+    additional_user_ids = @committers.collect(&:last).collect(&:to_i) - @users.collect(&:id)
+    @users += User.find_all_by_id(additional_user_ids) unless additional_user_ids.empty?
+    @users.compact!
+    @users.sort!
+    if request.post?
+      @repository.committer_ids = params[:committers]
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'committers', :id => @project
+    end
+  end
+  
+  def destroy
+    @repository.destroy
+    redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'repository'
+  end
   
   def show
-    # get entries for the browse frame
-    @entries = @repository.scm.entries('')
-    show_error and return unless @entries
     # check if new revisions have been committed in the repository
-    scm_latestrev = @entries.revisions.latest
-    if Setting.autofetch_changesets? && scm_latestrev && ((@repository.latest_changeset.nil?) || (@repository.latest_changeset.revision < scm_latestrev.identifier.to_i))
-      @repository.fetch_changesets
-      @repository.reload
-    end
-    @changesets = @repository.changesets.find(:all, :limit => 5, :order => "committed_on DESC")
+    @repository.fetch_changesets if Setting.autofetch_changesets?
+    # root entries
+    @entries = @repository.entries('', @rev)    
+    # latest changesets
+    @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
+    show_error_not_found unless @entries || @changesets.any?
   end
   
   def browse
-    @entries = @repository.scm.entries(@path, @rev)
-    show_error and return unless @entries
+    @entries = @repository.entries(@path, @rev)
+    if request.xhr?
+      @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
+    else
+      show_error_not_found and return unless @entries
+      @properties = @repository.properties(@path, @rev)
+      render :action => 'browse'
+    end
+  end
+  
+  def changes
+    @entry = @repository.entry(@path, @rev)
+    show_error_not_found and return unless @entry
+    @changesets = @repository.changesets_for_path(@path)
+    @properties = @repository.properties(@path, @rev)
   end
   
   def revisions
-    unless @path == ''
-      @entry = @repository.scm.entry(@path, @rev)  
-      show_error and return unless @entry
+    @changeset_count = @repository.changesets.count
+    @changeset_pages = Paginator.new self, @changeset_count,
+								      per_page_option,
+								      params['page']								
+    @changesets = @repository.changesets.find(:all,
+						:limit  =>  @changeset_pages.items_per_page,
+						:offset =>  @changeset_pages.current.offset,
+            :include => :user)
+
+    respond_to do |format|
+      format.html { render :layout => false if request.xhr? }
+      format.atom { render_feed(@changesets, :title => "#{@project.name}: #{l(:label_revision_plural)}") }
     end
-    @repository.changesets_with_path @path do
-      @changeset_count = @repository.changesets.count
-      @changeset_pages = Paginator.new self, @changeset_count,
-  								      25,
-  								      params['page']								
-      @changesets = @repository.changesets.find(:all,
-  						:limit  =>  @changeset_pages.items_per_page,
-  						:offset =>  @changeset_pages.current.offset)
-    end
-    render :action => "revisions", :layout => false if request.xhr?
   end
   
   def entry
-    if 'raw' == params[:format]
-      content = @repository.scm.cat(@path, @rev)
-      show_error and return unless content
-      send_data content, :filename => @path.split('/').last
-    end
+    @entry = @repository.entry(@path, @rev)
+    show_error_not_found and return unless @entry
+    
+    # If the entry is a dir, show the browser
+    browse and return if @entry.is_dir?
+    
+    @content = @repository.cat(@path, @rev)
+    show_error_not_found and return unless @content
+    if 'raw' == params[:format] || @content.is_binary_data?
+      # Force the download if it's a binary file
+      send_data @content, :filename => @path.split('/').last
+    else
+      # Prevent empty lines when displaying a file with Windows style eol
+      @content.gsub!("\r\n", "\n")
+   end
+  end
+  
+  def annotate
+    @annotate = @repository.scm.annotate(@path, @rev)
+    render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
   end
   
   def revision
     @changeset = @repository.changesets.find_by_revision(@rev)
-    show_error and return unless @changeset
+    raise ChangesetNotFound unless @changeset
+
+    respond_to do |format|
+      format.html
+      format.js {render :layout => false}
+    end
+  rescue ChangesetNotFound
+    show_error_not_found
   end
   
   def diff
-    @rev_to = params[:rev_to] || (@rev-1)
-    type = params[:type] || 'inline'
-    @diff = @repository.scm.diff(params[:path], @rev, @rev_to, type)
-    show_error and return unless @diff
+    if params[:format] == 'diff'
+      @diff = @repository.diff(@path, @rev, @rev_to)
+      show_error_not_found and return unless @diff
+      filename = "changeset_r#{@rev}"
+      filename << "_r#{@rev_to}" if @rev_to
+      send_data @diff.join, :filename => "#{filename}.diff",
+                            :type => 'text/x-patch',
+                            :disposition => 'attachment'
+    else
+      @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+      @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+      
+      # Save diff type as user preference
+      if User.current.logged? && @diff_type != User.current.pref[:diff_type]
+        User.current.pref[:diff_type] = @diff_type
+        User.current.preference.save
+      end
+      
+      @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")    
+      unless read_fragment(@cache_key)
+        @diff = @repository.diff(@path, @rev, @rev_to)
+        show_error_not_found unless @diff
+      end
+    end
   end
   
   def stats  
@@ -101,28 +191,45 @@ class RepositoriesController < ApplicationController
 private
   def find_project
     @project = Project.find(params[:id])
-    @repository = @project.repository
-    render_404 and return false unless @repository
-    @path = params[:path].squeeze('/').gsub(/^\//, '') if params[:path]
-    @path ||= ''
-    @rev = params[:rev].to_i if params[:rev] and params[:rev].to_i > 0
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+  
+  REV_PARAM_RE = %r{^[a-f0-9]*$}
+  
+  def find_repository
+    @project = Project.find(params[:id])
+    @repository = @project.repository
+    render_404 and return false unless @repository
+    @path = params[:path].join('/') unless params[:path].nil?
+    @path ||= ''
+    @rev = params[:rev]
+    @rev_to = params[:rev_to]
+    raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  rescue InvalidRevisionParam
+    show_error_not_found
+  end
 
-  def show_error
-    flash.now[:notice] = l(:notice_scm_error)
-    render :nothing => true, :layout => true
+  def show_error_not_found
+    render_error l(:error_scm_not_found)
+  end
+  
+  # Handler for Redmine::Scm::Adapters::CommandFailed exception
+  def show_error_command_failed(exception)
+    render_error l(:error_scm_command_failed, exception.message)
   end
   
   def graph_commits_per_month(repository)
     @date_to = Date.today
-    @date_from = @date_to << 12
+    @date_from = @date_to << 11
+    @date_from = Date.civil(@date_from.year, @date_from.month, 1)
     commits_by_day = repository.changesets.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
     commits_by_month = [0] * 12
     commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
 
-    changes_by_day = repository.changes.count(:all, :group => :commit_date)
+    changes_by_day = repository.changes.count(:all, :group => :commit_date, :conditions => ["commit_date BETWEEN ? AND ?", @date_from, @date_to])
     changes_by_month = [0] * 12
     changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
    
@@ -132,7 +239,7 @@ private
   
     graph = SVG::Graph::Bar.new(
       :height => 300,
-      :width => 500,
+      :width => 800,
       :fields => fields.reverse,
       :stack => :side,
       :scale_integers => true,
@@ -170,9 +277,12 @@ private
     commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
     changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
     
+    # Remove email adress in usernames
+    fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
+    
     graph = SVG::Graph::BarHorizontal.new(
-      :height => 300,
-      :width => 500,
+      :height => 400,
+      :width => 800,
       :fields => fields,
       :stack => :side,
       :scale_integers => true,
@@ -206,3 +316,9 @@ class Date
     (date.year - self.year)*52 + (date.cweek - self.cweek)
   end
 end
+
+class String
+  def with_leading_slash
+    starts_with?('/') ? self : "/#{self}"
+  end
+end

app/controllers/roles_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RolesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :move ],
@@ -28,41 +27,41 @@ class RolesController < ApplicationController
   end
 
   def list
-    @role_pages, @roles = paginate :roles, :per_page => 25, :order => "position"
+    @role_pages, @roles = paginate :roles, :per_page => 25, :order => 'builtin, position'
     render :action => "list", :layout => false if request.xhr?
   end
 
   def new
-    @role = Role.new(params[:role])
-    if request.post?
-      @role.permissions = Permission.find(params[:permission_ids]) if params[:permission_ids]
-      if @role.save
-        flash[:notice] = l(:notice_successful_create)
-        redirect_to :action => 'list'
+    # Prefills the form with 'Non member' role permissions
+    @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
+    if request.post? && @role.save
+      # workflow copy
+      if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
+        @role.workflows.copy(copy_from)
       end
+      flash[:notice] = l(:notice_successful_create)
+      redirect_to :action => 'list'
     end
-    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
+    @permissions = @role.setable_permissions
+    @roles = Role.find :all, :order => 'builtin, position'
   end
 
   def edit
     @role = Role.find(params[:id])
     if request.post? and @role.update_attributes(params[:role])
-      @role.permissions = Permission.find(params[:permission_ids] || [])
-      Permission.allowed_to_role_expired
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'list'
     end
-    @permissions = Permission.find(:all, :conditions => ["is_public=?", false], :order => 'sort ASC')
+    @permissions = @role.setable_permissions
   end
 
   def destroy
     @role = Role.find(params[:id])
-    unless @role.members.empty?
-      flash[:notice] = 'Some members have this role. Can\'t delete it.'
-    else
-      @role.destroy
-    end
+    @role.destroy
     redirect_to :action => 'list'
+  rescue
+    flash[:error] = 'This role is in use and can not be deleted.'
+    redirect_to :action => 'index'
   end
   
   def move
@@ -80,34 +79,14 @@ class RolesController < ApplicationController
     redirect_to :action => 'list'
   end
   
-  def workflow    
-    @role = Role.find_by_id(params[:role_id])
-    @tracker = Tracker.find_by_id(params[:tracker_id])    
-    
-    if request.post?
-      Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
-      (params[:issue_status] || []).each { |old, news| 
-        news.each { |new| 
-          @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new) 
-        }
-      }
-      if @role.save
-        flash[:notice] = l(:notice_successful_update)
-      end
-    end
-    @roles = Role.find(:all, :order => 'position')
-    @trackers = Tracker.find(:all, :order => 'position')
-    @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
-  end
-  
   def report    
-    @roles = Role.find(:all, :order => 'position')
-    @permissions = Permission.find :all, :conditions => ["is_public=?", false], :order => 'sort'
+    @roles = Role.find(:all, :order => 'builtin, position')
+    @permissions = Redmine::AccessControl.permissions.select { |p| !p.public? }
     if request.post?
       @roles.each do |role|
-        role.permissions = Permission.find(params[:permission_ids] ? (params[:permission_ids][role.id.to_s] || []) : [] )
+        role.permissions = params[:permissions][role.id.to_s]
+        role.save
       end
-      Permission.allowed_to_role_expired
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'list'
     end

app/controllers/search_controller.rb

@@ -0,0 +1,116 @@
+# redMine - project management software
+# Copyright (C) 2006  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.
+
+class SearchController < ApplicationController
+  before_filter :find_optional_project
+
+  helper :messages
+  include MessagesHelper
+
+  def index
+    @question = params[:q] || ""
+    @question.strip!
+    @all_words = params[:all_words] || (params[:submit] ? false : true)
+    @titles_only = !params[:titles_only].nil?
+    
+    projects_to_search =
+      case params[:scope]
+      when 'all'
+        nil
+      when 'my_projects'
+        User.current.memberships.collect(&:project)
+      when 'subprojects'
+        @project ? ([ @project ] + @project.active_children) : nil
+      else
+        @project
+      end
+          
+    offset = nil
+    begin; offset = params[:offset].to_time if params[:offset]; rescue; end
+    
+    # quick jump to an issue
+    if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(User.current))
+      redirect_to :controller => "issues", :action => "show", :id => $1
+      return
+    end
+    
+    @object_types = %w(issues news documents changesets wiki_pages messages projects)
+    if projects_to_search.is_a? Project
+      # don't search projects
+      @object_types.delete('projects')
+      # only show what the user is allowed to view
+      @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, projects_to_search)}
+    end
+      
+    @scope = @object_types.select {|t| params[t]}
+    @scope = @object_types if @scope.empty?
+    
+    # extract tokens from the question
+    # eg. hello "bye bye" => ["hello", "bye bye"]
+    @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
+    # tokens must be at least 3 character long
+    @tokens = @tokens.uniq.select {|w| w.length > 2 }
+    
+    if !@tokens.empty?
+      # no more than 5 tokens to search for
+      @tokens.slice! 5..-1 if @tokens.size > 5
+      # strings used in sql like statement
+      like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}      
+      
+      @results = []
+      @results_by_type = Hash.new {|h,k| h[k] = 0}
+      
+      limit = 10
+      @scope.each do |s|
+        r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
+          :all_words => @all_words,
+          :titles_only => @titles_only,
+          :limit => (limit+1),
+          :offset => offset,
+          :before => params[:previous].nil?)
+        @results += r
+        @results_by_type[s] += c
+      end
+      @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
+      if params[:previous].nil?
+        @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
+        if @results.size > limit
+          @pagination_next_date = @results[limit-1].event_datetime 
+          @results = @results[0, limit]
+        end
+      else
+        @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
+        if @results.size > limit
+          @pagination_previous_date = @results[-(limit)].event_datetime 
+          @results = @results[-(limit), limit]
+        end
+      end
+    else
+      @question = ""
+    end
+    render :layout => false if request.xhr?
+  end
+
+private  
+  def find_optional_project
+    return true unless params[:id]
+    @project = Project.find(params[:id])
+    check_project_privacy
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/settings_controller.rb

@@ -5,29 +5,55 @@
 # 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.
 
 class SettingsController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
-  
+
   def index
     edit
     render :action => 'edit'
   end
 
   def edit
-    if request.post? and params[:settings] and params[:settings].is_a? Hash
-      params[:settings].each { |name, value| Setting[name] = value }
-      redirect_to :action => 'edit' and return
+    @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
+    if request.post? && params[:settings] && params[:settings].is_a?(Hash)
+      settings = (params[:settings] || {}).dup.symbolize_keys
+      settings.each do |name, value|
+        # remove blank values in array settings
+        value.delete_if {|v| v.blank? } if value.is_a?(Array)
+        Setting[name] = value
+      end
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'edit', :tab => params[:tab]
+      return
     end
+    @options = {}
+    @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
+    @deliveries = ActionMailer::Base.perform_deliveries
+
+    @guessed_host_and_path = request.host_with_port
+    @guessed_host_and_path << ('/'+ request.relative_url_root.gsub(%r{^\/}, '')) unless request.relative_url_root.blank?
+  end
+
+  def plugin
+    @plugin = Redmine::Plugin.find(params[:id])
+    if request.post?
+      Setting["plugin_#{@plugin.id}"] = params[:settings]
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'plugin', :id => @plugin.id
+    end
+    @partial = @plugin.settings[:partial]
+    @settings = Setting["plugin_#{@plugin.id}"]
+  rescue Redmine::PluginNotFound
+    render_404
   end
 end

app/controllers/sys_controller.rb

@@ -22,18 +22,20 @@ class SysController < ActionController::Base
   
   before_invocation :check_enabled
   
-  def projects
-    Project.find(:all, :include => :repository)
+  # Returns the projects list, with their repositories
+  def projects_with_repository_enabled
+    Project.has_module(:repository).find(:all, :include => :repository, :order => 'identifier')
   end
 
-  def repository_created(project_id, url)
-    project = Project.find_by_id(project_id)
+  # Registers a repository for the given project identifier
+  def repository_created(identifier, vendor, url)
+    project = Project.find_by_identifier(identifier)
+    # Do not create the repository if the project has already one
     return 0 unless project && project.repository.nil?
-    logger.debug "Repository for #{project.name} created"
-    repository = Repository.new(:project => project, :url => url)
-    repository.root_url = url
+    logger.debug "Repository for #{project.name} was created"
+    repository = Repository.factory(vendor, :project => project, :url => url)
     repository.save
-    repository.id
+    repository.id || 0
   end
 
 protected

app/controllers/timelog_controller.rb

@@ -1,36 +1,212 @@
-class TimelogController < ApplicationController
-  layout 'base'
-  
-  before_filter :find_project
-  before_filter :authorize, :only => :edit
-  before_filter :check_project_privacy, :only => :details
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
 
+class TimelogController < ApplicationController
+  menu_item :issues
+  before_filter :find_project, :authorize, :only => [:edit, :destroy]
+  before_filter :find_optional_project, :only => [:report, :details]
+
+  verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
+  
   helper :sort
   include SortHelper
+  helper :issues
+  include TimelogHelper
+  helper :custom_fields
+  include CustomFieldsHelper
+  
+  def report
+    @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
+                                          :klass => Project,
+                                          :label => :label_project},
+                             'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
+                                          :klass => Version,
+                                          :label => :label_version},
+                             'category' => {:sql => "#{Issue.table_name}.category_id",
+                                            :klass => IssueCategory,
+                                            :label => :field_category},
+                             'member' => {:sql => "#{TimeEntry.table_name}.user_id",
+                                         :klass => User,
+                                         :label => :label_member},
+                             'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
+                                          :klass => Tracker,
+                                          :label => :label_tracker},
+                             'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
+                                           :klass => Enumeration,
+                                           :label => :label_activity},
+                             'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
+                                         :klass => Issue,
+                                         :label => :label_issue}
+                           }
+    
+    # Add list and boolean custom fields as available criterias
+    custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
+    custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
+                                             :format => cf.field_format,
+                                             :label => cf.name}
+    end if @project
+    
+    # Add list and boolean time entry custom fields
+    TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
+                                             :format => cf.field_format,
+                                             :label => cf.name}
+    end
+    
+    @criterias = params[:criterias] || []
+    @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
+    @criterias.uniq!
+    @criterias = @criterias[0,3]
+    
+    @columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
+    
+    retrieve_date_range
+    
+    unless @criterias.empty?
+      sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
+      sql_group_by = @criterias.collect{|criteria| @available_criterias[criteria][:sql]}.join(', ')
+      
+      sql = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
+      sql << " FROM #{TimeEntry.table_name}"
+      sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+      sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
+      sql << " WHERE"
+      sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
+      sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
+      sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
+      sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
+      
+      @hours = ActiveRecord::Base.connection.select_all(sql)
+      
+      @hours.each do |row|
+        case @columns
+        when 'year'
+          row['year'] = row['tyear']
+        when 'month'
+          row['month'] = "#{row['tyear']}-#{row['tmonth']}"
+        when 'week'
+          row['week'] = "#{row['tyear']}-#{row['tweek']}"
+        when 'day'
+          row['day'] = "#{row['spent_on']}"
+        end
+      end
+      
+      @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
+      
+      @periods = []
+      # Date#at_beginning_of_ not supported in Rails 1.2.x
+      date_from = @from.to_time
+      # 100 columns max
+      while date_from <= @to.to_time && @periods.length < 100
+        case @columns
+        when 'year'
+          @periods << "#{date_from.year}"
+          date_from = (date_from + 1.year).at_beginning_of_year
+        when 'month'
+          @periods << "#{date_from.year}-#{date_from.month}"
+          date_from = (date_from + 1.month).at_beginning_of_month
+        when 'week'
+          @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
+          date_from = (date_from + 7.day).at_beginning_of_week
+        when 'day'
+          @periods << "#{date_from.to_date}"
+          date_from = date_from + 1.day
+        end
+      end
+    end
+    
+    respond_to do |format|
+      format.html { render :layout => !request.xhr? }
+      format.csv  { send_data(report_to_csv(@criterias, @periods, @hours).read, :type => 'text/csv; header=present', :filename => 'timelog.csv') }
+    end
+  end
   
   def details
     sort_init 'spent_on', 'desc'
     sort_update
     
-    @entries = (@issue ? @issue : @project).time_entries.find(:all, :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}], :order => sort_clause)
-
-    @total_hours = @entries.inject(0) { |sum,entry| sum + entry.hours }
-    @owner_id = logged_in_user ? logged_in_user.id : 0
+    cond = ARCondition.new
+    if @project.nil?
+      cond << Project.allowed_to_condition(User.current, :view_time_entries)
+    elsif @issue.nil?
+      cond << @project.project_condition(Setting.display_subprojects_issues?)
+    else
+      cond << ["#{TimeEntry.table_name}.issue_id = ?", @issue.id]
+    end
     
-    send_csv and return if 'csv' == params[:export]    
-    render :action => 'details', :layout => false if request.xhr?
+    retrieve_date_range
+    cond << ['spent_on BETWEEN ? AND ?', @from, @to]
+
+    TimeEntry.visible_by(User.current) do
+      respond_to do |format|
+        format.html {
+          # Paginate results
+          @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
+          @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
+          @entries = TimeEntry.find(:all, 
+                                    :include => [:project, :activity, :user, {:issue => :tracker}],
+                                    :conditions => cond.conditions,
+                                    :order => sort_clause,
+                                    :limit  =>  @entry_pages.items_per_page,
+                                    :offset =>  @entry_pages.current.offset)
+          @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
+
+          render :layout => !request.xhr?
+        }
+        format.atom {
+          entries = TimeEntry.find(:all,
+                                   :include => [:project, :activity, :user, {:issue => :tracker}],
+                                   :conditions => cond.conditions,
+                                   :order => "#{TimeEntry.table_name}.created_on DESC",
+                                   :limit => Setting.feeds_limit.to_i)
+          render_feed(entries, :title => l(:label_spent_time))
+        }
+        format.csv {
+          # Export all entries
+          @entries = TimeEntry.find(:all, 
+                                    :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                                    :conditions => cond.conditions,
+                                    :order => sort_clause)
+          send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
+        }
+      end
+    end
   end
   
   def edit
-    render_404 and return if @time_entry && @time_entry.user != logged_in_user
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
+    render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
+    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
     @time_entry.attributes = params[:time_entry]
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
+      redirect_back_or_default :action => 'details', :project_id => @time_entry.project
       return
     end    
-    @activities = Enumeration::get_values('ACTI')
+  end
+  
+  def destroy
+    render_404 and return unless @time_entry
+    render_403 and return unless @time_entry.editable_by?(User.current)
+    @time_entry.destroy
+    flash[:notice] = l(:notice_successful_delete)
+    redirect_to :back
+  rescue ::ActionController::RedirectBackError
+    redirect_to :action => 'details', :project_id => @time_entry.project
   end
 
 private
@@ -47,34 +223,63 @@ private
       render_404
       return false
     end
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
   
-  def send_csv
-    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
-    export = StringIO.new
-    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
-      # csv header fields
-      headers = [l(:field_spent_on),
-                 l(:field_user),
-                 l(:field_activity),
-                 l(:field_issue),
-                 l(:field_hours),
-                 l(:field_comment)
-                 ]
-      csv << headers.collect {|c| ic.iconv(c) }
-      # csv lines
-      @entries.each do |entry|
-        fields = [l_date(entry.spent_on),
-                  entry.user.name,
-                  entry.activity.name,
-                  (entry.issue ? entry.issue.id : nil),
-                  entry.hours,
-                  entry.comment
-                  ]
-        csv << fields.collect {|c| ic.iconv(c.to_s) }
-      end
+  def find_optional_project
+    if !params[:issue_id].blank?
+      @issue = Issue.find(params[:issue_id])
+      @project = @issue.project
+    elsif !params[:project_id].blank?
+      @project = Project.find(params[:project_id])
     end
-    export.rewind
-    send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
+    deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
+  end
+  
+  # Retrieves the date range based on predefined ranges or specific from/to param dates
+  def retrieve_date_range
+    @free_period = false
+    @from, @to = nil, nil
+
+    if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
+      case params[:period].to_s
+      when 'today'
+        @from = @to = Date.today
+      when 'yesterday'
+        @from = @to = Date.today - 1
+      when 'current_week'
+        @from = Date.today - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when 'last_week'
+        @from = Date.today - 7 - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when '7_days'
+        @from = Date.today - 7
+        @to = Date.today
+      when 'current_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1)
+        @to = (@from >> 1) - 1
+      when 'last_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
+        @to = (@from >> 1) - 1
+      when '30_days'
+        @from = Date.today - 30
+        @to = Date.today
+      when 'current_year'
+        @from = Date.civil(Date.today.year, 1, 1)
+        @to = Date.civil(Date.today.year, 12, 31)
+      end
+    elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
+      begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
+      begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
+      @free_period = true
+    else
+      # default
+    end
+    
+    @from, @to = @to, @from if @from && @to && @from > @to
+    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
+    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
   end
 end

app/controllers/trackers_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TrackersController < ApplicationController
-  layout 'base'
   before_filter :require_admin
 
   def index
@@ -36,15 +35,13 @@ class TrackersController < ApplicationController
     @tracker = Tracker.new(params[:tracker])
     if request.post? and @tracker.save
       # workflow copy
-      if params[:copy_workflow_from] && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
-        copy_from.workflows.each do |w|
-          @tracker.workflows << w.clone
-        end
+      if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
+        @tracker.workflows.copy(copy_from)
       end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'
     end
-    @trackers = Tracker.find :all
+    @trackers = Tracker.find :all, :order => 'position'
   end
 
   def edit
@@ -73,7 +70,7 @@ class TrackersController < ApplicationController
   def destroy
     @tracker = Tracker.find(params[:id])
     unless @tracker.issues.empty?
-      flash[:notice] = "This tracker contains issues and can\'t be deleted."
+      flash[:error] = "This tracker contains issues and can\'t be deleted."
     else
       @tracker.destroy
     end

app/controllers/users_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class UsersController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   helper :sort
@@ -33,16 +32,20 @@ class UsersController < ApplicationController
     sort_init 'login', 'asc'
     sort_update
     
-    @status = params[:status] ? params[:status].to_i : 1    
-    conditions = nil
-    conditions = ["status=?", @status] unless @status == 0
+    @status = params[:status] ? params[:status].to_i : 1
+    c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status])
+
+    unless params[:name].blank?
+      name = "%#{params[:name].strip.downcase}%"
+      c << ["LOWER(login) LIKE ? OR LOWER(firstname) LIKE ? OR LOWER(lastname) LIKE ?", name, name, name]
+    end
     
-    @user_count = User.count(:conditions => conditions)
+    @user_count = User.count(:conditions => c.conditions)
     @user_pages = Paginator.new self, @user_count,
-								15,
+								per_page_option,
 								params['page']								
     @users =  User.find :all,:order => sort_clause,
-                        :conditions => conditions,
+                        :conditions => c.conditions,
 						:limit  =>  @user_pages.items_per_page,
 						:offset =>  @user_pages.current.offset
 
@@ -52,15 +55,13 @@ class UsersController < ApplicationController
   def add
     if request.get?
       @user = User.new(:language => Setting.default_language)
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
     else
       @user = User.new(params[:user])
       @user.admin = params[:user][:admin] || false
       @user.login = params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-      @user.custom_values = @custom_values			
       if @user.save
+        Mailer.deliver_account_information(@user, params[:password]) if params[:send_information]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :action => 'list'
       end
@@ -70,50 +71,34 @@ class UsersController < ApplicationController
 
   def edit
     @user = User.find(params[:id])
-    if request.get?
-      @custom_values = UserCustomField.find(:all).collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
-    else
+    if request.post?
       @user.admin = params[:user][:admin] if params[:user][:admin]
       @user.login = params[:user][:login] if params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
-      if params[:custom_fields]
-        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-        @user.custom_values = @custom_values
-      end
       if @user.update_attributes(params[:user])
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :action => 'list'
+        # Give a string to redirect_to otherwise it would use status param as the response code
+        redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
       end
     end
     @auth_sources = AuthSource.find(:all)
-    @roles = Role.find(:all, :order => 'position')
-    @projects = Project.find(:all) - @user.projects
+    @roles = Role.find_all_givable
+    @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
     @membership ||= Member.new
+    @memberships = @user.memberships
   end
   
   def edit_membership
     @user = User.find(params[:id])
     @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
     @membership.attributes = params[:membership]
-    if request.post? and @membership.save
-      flash[:notice] = l(:notice_successful_update)
-    end
-    redirect_to :action => 'edit', :id => @user and return
+    @membership.save if request.post?
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
   end
   
   def destroy_membership
     @user = User.find(params[:id])
-    if request.post? and Member.find(params[:membership_id]).destroy
-      flash[:notice] = l(:notice_successful_update)
-    end
-    redirect_to :action => 'edit', :id => @user and return
+    Member.find(params[:membership_id]).destroy if request.post?
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
   end
-
-  def destroy
-    User.find(params[:id]).destroy
-    redirect_to :action => 'list'
-  rescue
-    flash[:notice] = "Unable to delete user"
-    redirect_to :action => 'list'
-  end  
 end

app/controllers/versions_controller.rb

@@ -16,9 +16,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class VersionsController < ApplicationController
-  layout 'base'
+  menu_item :roadmap
   before_filter :find_project, :authorize
 
+  def show
+  end
+  
   def edit
     if request.post? and @version.update_attributes(params[:version])
       flash[:notice] = l(:notice_successful_update)
@@ -30,23 +33,22 @@ class VersionsController < ApplicationController
     @version.destroy
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   rescue
-    flash[:notice] = "Unable to delete version"
+    flash[:error] = l(:notice_unable_delete_version)
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   end
-
-  def download
-    @attachment = @version.attachments.find(params[:attachment_id])
-    @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename
-  rescue
-    render_404
-  end 
   
   def destroy_file
     @version.attachments.find(params[:attachment_id]).destroy
     flash[:notice] = l(:notice_successful_delete)
     redirect_to :controller => 'projects', :action => 'list_files', :id => @project
   end
+  
+  def status_by
+    respond_to do |format|
+      format.html { render :action => 'show' }
+      format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
+    end
+  end
 
 private
   def find_project

app/controllers/watchers_controller.rb

@@ -0,0 +1,70 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class WatchersController < ApplicationController
+  before_filter :find_project
+  before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
+  before_filter :authorize, :only => :new
+  
+  verify :method => :post,
+         :only => [ :watch, :unwatch ],
+         :render => { :nothing => true, :status => :method_not_allowed }
+  
+  def watch
+    set_watcher(User.current, true)
+  end
+  
+  def unwatch
+    set_watcher(User.current, false)
+  end
+  
+  def new
+    @watcher = Watcher.new(params[:watcher])
+    @watcher.watchable = @watched
+    @watcher.save if request.post?
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js do
+        render :update do |page|
+          page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+        end
+      end
+    end
+  rescue ::ActionController::RedirectBackError
+    render :text => 'Watcher added.', :layout => true
+  end
+  
+private
+  def find_project
+    klass = Object.const_get(params[:object_type].camelcase)
+    return false unless klass.respond_to?('watched_by')
+    @watched = klass.find(params[:object_id])
+    @project = @watched.project
+  rescue
+    render_404
+  end
+  
+  def set_watcher(user, watching)
+    @watched.set_watcher(user, watching)
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+    end
+  rescue ::ActionController::RedirectBackError
+    render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
+  end
+end

app/controllers/welcome_controller.rb

@@ -16,10 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
-  layout 'base'
 
   def index
-    @news = News.latest logged_in_user
-    @projects = Project.latest logged_in_user
+    @news = News.latest User.current
+    @projects = Project.latest User.current
   end
 end

app/controllers/wiki_controller.rb

@@ -15,17 +15,33 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'diff'
+
 class WikiController < ApplicationController
-  layout 'base'
-  before_filter :find_wiki, :check_project_privacy, :except => [:preview]
-    
+  before_filter :find_wiki, :authorize
+  
+  verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
+
+  helper :attachments
+  include AttachmentsHelper   
+  
   # display a page (in editing mode if it doesn't exist)
   def index
     page_title = params[:page]
     @page = @wiki.find_or_new_page(page_title)
     if @page.new_record?
-      edit
-      render :action => 'edit' and return
+      if User.current.allowed_to?(:edit_wiki_pages, @project)
+        edit
+        render :action => 'edit'
+      else
+        render_404
+      end
+      return
+    end
+    if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
+      # Redirects user to the current version if he's not allowed to view previous versions
+      redirect_to :version => nil
+      return
     end
     @content = @page.content_for_version(params[:version])
     if params[:export] == 'html'
@@ -36,41 +52,95 @@ class WikiController < ApplicationController
       send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
       return
     end
+	@editable = editable?
     render :action => 'show'
   end
   
   # edit an existing page or a new one
   def edit
     @page = @wiki.find_or_new_page(params[:page])    
+    return render_403 unless editable?
     @page.content = WikiContent.new(:page => @page) if @page.new_record?
     
     @content = @page.content_for_version(params[:version])
-    @content.text = "h1. #{@page.pretty_title}" if @content.text.blank?
+    @content.text = initial_page_content(@page) if @content.text.blank?
     # don't keep previous comment
-    @content.comment = nil
-    if request.post?      
-      if @content.text == params[:content][:text]
+    @content.comments = nil
+    if request.get?
+      # To prevent StaleObjectError exception when reverting to a previous version
+      @content.version = @page.content.version
+    else
+      if !@page.new_record? && @content.text == params[:content][:text]
         # don't save if text wasn't changed
         redirect_to :action => 'index', :id => @project, :page => @page.title
         return
       end
-      @content.text = params[:content][:text]
-      @content.comment = params[:content][:comment]
-      @content.author = logged_in_user
+      #@content.text = params[:content][:text]
+      #@content.comments = params[:content][:comments]
+      @content.attributes = params[:content]
+      @content.author = User.current
       # if page is new @page.save will also save content, but not if page isn't a new record
       if (@page.new_record? ? @page.save : @content.save)
         redirect_to :action => 'index', :id => @project, :page => @page.title
       end
     end
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash[:error] = l(:notice_locking_conflict)
   end
   
+  # rename a page
+  def rename
+    @page = @wiki.find_page(params[:page])
+	return render_403 unless editable?
+    @page.redirect_existing_links = true
+    # used to display the *original* title if some AR validation errors occur
+    @original_title = @page.pretty_title
+    if request.post? && @page.update_attributes(params[:wiki_page])
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'index', :id => @project, :page => @page.title
+    end
+  end
+  
+  def protect
+    page = @wiki.find_page(params[:page])
+    page.update_attribute :protected, params[:protected]
+    redirect_to :action => 'index', :id => @project, :page => page.title
+  end
+
   # show page history
   def history
     @page = @wiki.find_page(params[:page])
-    # don't load text
+    
+    @version_count = @page.content.versions.count
+    @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
+    # don't load text    
     @versions = @page.content.versions.find :all, 
-                                            :select => "id, author_id, comment, updated_on, version",
-                                            :order => 'version DESC'
+                                            :select => "id, author_id, comments, updated_on, version",
+                                            :order => 'version DESC',
+                                            :limit  =>  @version_pages.items_per_page + 1,
+                                            :offset =>  @version_pages.current.offset
+
+    render :layout => false if request.xhr?
+  end
+  
+  def diff
+    @page = @wiki.find_page(params[:page])
+    @diff = @page.diff(params[:version], params[:version_from])
+    render_404 unless @diff
+  end
+  
+  def annotate
+    @page = @wiki.find_page(params[:page])
+    @annotate = @page.annotate(params[:version])
+  end
+  
+  # remove a wiki page and its history
+  def destroy
+    @page = @wiki.find_page(params[:page])
+	return render_403 unless editable?
+    @page.destroy if @page
+    redirect_to :action => 'special', :id => @project, :page => 'Page_index'
   end
 
   # display special pages
@@ -78,11 +148,13 @@ class WikiController < ApplicationController
     page_title = params[:page].downcase
     case page_title
     # show pages index, sorted by title
-    when 'page_index'
+    when 'page_index', 'date_index'
       # eager load information about last updates, without loading text
       @pages = @wiki.pages.find :all, :select => "#{WikiPage.table_name}.*, #{WikiContent.table_name}.updated_on",
                                       :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                       :order => 'title'
+      @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
+      @pages_by_parent_id = @pages.group_by(&:parent_id)
     # export wiki to a single html file
     when 'export'
       @pages = @wiki.pages.find :all, :order => 'title'
@@ -97,8 +169,29 @@ class WikiController < ApplicationController
   end
   
   def preview
+    page = @wiki.find_page(params[:page])
+    # page is nil when previewing a new page
+    return render_403 unless page.nil? || editable?(page)
+    if page
+      @attachements = page.attachments
+      @previewed = page.content
+    end
     @text = params[:content][:text]
-    render :partial => 'preview'
+    render :partial => 'common/preview'
+  end
+
+  def add_attachment
+    @page = @wiki.find_page(params[:page])
+    return render_403 unless editable?
+    attach_files(@page, params[:attachments])
+    redirect_to :action => 'index', :page => @page.title
+  end
+
+  def destroy_attachment
+    @page = @wiki.find_page(params[:page])
+    return render_403 unless editable?
+    @page.attachments.find(params[:attachment_id]).destroy
+    redirect_to :action => 'index', :page => @page.title
   end
 
 private
@@ -106,7 +199,20 @@ private
   def find_wiki
     @project = Project.find(params[:id])
     @wiki = @project.wiki
+    render_404 unless @wiki
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+  
+  # Returns true if the current user is allowed to edit the page, otherwise false
+  def editable?(page = @page)
+    page.editable_by?(User.current)
+  end
+
+  # Returns the default content of a new wiki page
+  def initial_page_content(page)
+    helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
+    extend helper unless self.instance_of?(helper)
+    helper.instance_method(:initial_page_content).bind(self).call(page)
+  end
 end

app/controllers/wikis_controller.rb

@@ -0,0 +1,44 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class WikisController < ApplicationController
+  menu_item :settings
+  before_filter :find_project, :authorize
+  
+  # Create or update a project's wiki
+  def edit
+    @wiki = @project.wiki || Wiki.new(:project => @project)
+    @wiki.attributes = params[:wiki]
+    @wiki.save if request.post?
+    render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
+  end
+
+  # Delete a project's wiki
+  def destroy
+    if request.post? && params[:confirm] && @project.wiki
+      @project.wiki.destroy
+      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'wiki'
+    end    
+  end
+  
+private
+  def find_project
+    @project = Project.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end

app/controllers/workflows_controller.rb

@@ -0,0 +1,45 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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.
+
+class WorkflowsController < ApplicationController
+  before_filter :require_admin
+
+  def index
+    @workflow_counts = Workflow.count_by_tracker_and_role
+  end
+  
+  def edit
+    @role = Role.find_by_id(params[:role_id])
+    @tracker = Tracker.find_by_id(params[:tracker_id])    
+    
+    if request.post?
+      Workflow.destroy_all( ["role_id=? and tracker_id=?", @role.id, @tracker.id])
+      (params[:issue_status] || []).each { |old, news| 
+        news.each { |new| 
+          @role.workflows.build(:tracker_id => @tracker.id, :old_status_id => old, :new_status_id => new) 
+        }
+      }
+      if @role.save
+        flash[:notice] = l(:notice_successful_update)
+        redirect_to :action => 'edit', :role_id => @role, :tracker_id => @tracker
+      end
+    end
+    @roles = Role.find(:all, :order => 'builtin, position')
+    @trackers = Tracker.find(:all, :order => 'position')
+    @statuses = IssueStatus.find(:all, :order => 'position')
+  end
+end

app/helpers/admin_helper.rb

@@ -16,4 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module AdminHelper
+  def project_status_options_for_select(selected)
+    options_for_select([[l(:label_all), ''], 
+                        [l(:status_active), 1]], selected)
+  end
 end

app/helpers/application_helper.rb

@@ -5,143 +5,471 @@
 # 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 ApplicationHelper
+require 'coderay'
+require 'coderay/helpers/file_type'
+require 'forwardable'
 
-  # Return current logged in user or nil
-  def loggedin?
-    @logged_in_user
-  end
-  
-  # Return true if user is logged in and is admin, otherwise false
-  def admin_loggedin?
-    @logged_in_user and @logged_in_user.admin?
+module ApplicationHelper
+  include Redmine::WikiFormatting::Macros::Definitions
+  include GravatarHelper::PublicMethods
+
+  extend Forwardable
+  def_delegators :wiki_helper, :wikitoolbar_for, :heads_for_wiki_formatter
+
+  def current_role
+    @current_role ||= User.current.role_for_project(@project)
   end
 
   # Return true if user is authorized for controller/action, otherwise false
-  def authorize_for(controller, action)  
-    # check if action is allowed on public projects
-    if @project.is_public? and Permission.allowed_to_public "%s/%s" % [ controller, action ]
-      return true
-    end
-    # check if user is authorized    
-    if @logged_in_user and (@logged_in_user.admin? or Permission.allowed_to_role( "%s/%s" % [ controller, action ], @logged_in_user.role_for_project(@project)  )  )
-      return true
-    end
-    return false
+  def authorize_for(controller, action)
+    User.current.allowed_to?({:controller => controller, :action => action}, @project)
   end
 
   # Display a link if user is authorized
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
-    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller], options[:action])
+    link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
+  end
+
+  # Display a link to remote if user is authorized
+  def link_to_remote_if_authorized(name, options = {}, html_options = nil)
+    url = options[:url] || {}
+    link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
   end
 
   # Display a link to user's account page
   def link_to_user(user)
-    link_to user.display_name, :controller => 'account', :action => 'show', :id => user
+    (user && !user.anonymous?) ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
   end
-  
-  def link_to_issue(issue)
-    link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
+
+  def link_to_issue(issue, options={})
+    options[:class] ||= ''
+    options[:class] << ' issue'
+    options[:class] << ' closed' if issue.closed?
+    link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
   end
-  
+
+  # Generates a link to an attachment.
+  # Options:
+  # * :text - Link text (default to attachment filename)
+  # * :download - Force download (default: false)
+  def link_to_attachment(attachment, options={})
+    text = options.delete(:text) || attachment.filename
+    action = options.delete(:download) ? 'download' : 'show'
+
+    link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
+  end
+
   def toggle_link(name, id, options={})
     onclick = "Element.toggle('#{id}'); "
     onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
     onclick << "return false;"
     link_to(name, "#", :onclick => onclick)
   end
-  
+
   def image_to_function(name, function, html_options = {})
     html_options.symbolize_keys!
-    tag(:input, html_options.merge({ 
-        :type => "image", :src => image_path(name), 
-        :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};" 
+    tag(:input, html_options.merge({
+        :type => "image", :src => image_path(name),
+        :onclick => (html_options[:onclick] ? "#{html_options[:onclick]}; " : "") + "#{function};"
         }))
   end
-  
+
+  def prompt_to_remote(name, text, param, url, html_options = {})
+    html_options[:onclick] = "promptToRemote('#{text}', '#{param}', '#{url_for(url)}'); return false;"
+    link_to name, {}, html_options
+  end
+
   def format_date(date)
-    l_date(date) if date
+    return nil unless date
+    # "Setting.date_format.size < 2" is a temporary fix (content of date_format setting changed)
+    @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
+    date.strftime(@date_format)
+  end
+
+  def format_time(time, include_date = true)
+    return nil unless time
+    time = time.to_time if time.is_a?(String)
+    zone = User.current.time_zone
+    local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
+    @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
+    @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
+    include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
   end
   
-  def format_time(time)
-    l_datetime((time.is_a? String) ? time.to_time : time) if time
+  def format_activity_title(text)
+    h(truncate_single_line(text, 100))
   end
   
+  def format_activity_day(date)
+    date == Date.today ? l(:label_today).titleize : format_date(date)
+  end
+  
+  def format_activity_description(text)
+    h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
+  end
+
+  def distance_of_date_in_words(from_date, to_date = 0)
+    from_date = from_date.to_date if from_date.respond_to?(:to_date)
+    to_date = to_date.to_date if to_date.respond_to?(:to_date)
+    distance_in_days = (to_date - from_date).abs
+    lwr(:actionview_datehelper_time_in_words_day, distance_in_days)
+  end
+
+  def due_date_distance_in_words(date)
+    if date
+      l((date < Date.today ? :label_roadmap_overdue : :label_roadmap_due_in), distance_of_date_in_words(Date.today, date))
+    end
+  end
+
+  def render_page_hierarchy(pages, node=nil)
+    content = ''
+    if pages[node]
+      content << "<ul class=\"pages-hierarchy\">\n"
+      pages[node].each do |page|
+        content << "<li>"
+        content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'index', :id => page.project, :page => page.title},
+                           :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
+        content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
+        content << "</li>\n"
+      end
+      content << "</ul>\n"
+    end
+    content
+  end
+
+  # Truncates and returns the string as a single line
+  def truncate_single_line(string, *args)
+    truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
+  end
+
+  def html_hours(text)
+    text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
+  end
+
+  def authoring(created, author, options={})
+    time_tag = @project.nil? ? content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created)) :
+                               link_to(distance_of_time_in_words(Time.now, created), 
+                                       {:controller => 'projects', :action => 'activity', :id => @project, :from => created.to_date},
+                                       :title => format_time(created))
+    author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
+    l(options[:label] || :label_added_time_by, author_tag, time_tag)
+  end
+
+  def l_or_humanize(s, options={})
+    k = "#{options[:prefix]}#{s}".to_sym
+    l_has_string?(k) ? l(k) : s.to_s.humanize
+  end
+
   def day_name(day)
     l(:general_day_names).split(',')[day-1]
   end
-  
+
   def month_name(month)
     l(:actionview_datehelper_select_month_names).split(',')[month-1]
   end
 
-  def pagination_links_full(paginator, options={}, html_options={})
-    html = ''    
-    html << link_to_remote(('&#171; ' + l(:label_previous)), 
-                            {:update => "content", :url => options.merge(:page => paginator.current.previous)},
-                            {:href => url_for(:params => options.merge(:page => paginator.current.previous))}) + ' ' if paginator.current.previous
-                            
-    html << (pagination_links_each(paginator, options) do |n|
-      link_to_remote(n.to_s, 
-                      {:url => {:params => options.merge(:page => n)}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(:page => n))})
-    end || '')
-    
-    html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => options.merge(:page => paginator.current.next)},
-                                 {:href => url_for(:params => options.merge(:page => paginator.current.next))}) if paginator.current.next
-    html  
+  def syntax_highlight(name, content)
+    type = CodeRay::FileType[name]
+    type ? CodeRay.scan(content, type).html : h(content)
   end
-  
-  # textilize text according to system settings and RedCloth availability
-  def textilizable(text, options = {})
+
+  def to_path_param(path)
+    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+  end
+
+  def pagination_links_full(paginator, count=nil, options={})
+    page_param = options.delete(:page_param) || :page
+    url_param = params.dup
+    # don't reuse params if filters are present
+    url_param.clear if url_param.has_key?(:set_filter)
+
+    html = ''
+    html << link_to_remote(('&#171; ' + l(:label_previous)),
+                            {:update => 'content',
+                             :url => url_param.merge(page_param => paginator.current.previous),
+                             :complete => 'window.scrollTo(0,0)'},
+                            {:href => url_for(:params => url_param.merge(page_param => paginator.current.previous))}) + ' ' if paginator.current.previous
+
+    html << (pagination_links_each(paginator, options) do |n|
+      link_to_remote(n.to_s,
+                      {:url => {:params => url_param.merge(page_param => n)},
+                       :update => 'content',
+                       :complete => 'window.scrollTo(0,0)'},
+                      {:href => url_for(:params => url_param.merge(page_param => n))})
+    end || '')
+
+    html << ' ' + link_to_remote((l(:label_next) + ' &#187;'),
+                                 {:update => 'content',
+                                  :url => url_param.merge(page_param => paginator.current.next),
+                                  :complete => 'window.scrollTo(0,0)'},
+                                 {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
+
+    unless count.nil?
+      html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
+    end
+
+    html
+  end
+
+  def per_page_links(selected=nil)
+    url_param = params.dup
+    url_param.clear if url_param.has_key?(:set_filter)
+
+    links = Setting.per_page_options_array.collect do |n|
+      n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)},
+                                            {:href => url_for(url_param.merge(:per_page => n))})
+    end
+    links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
+  end
+
+  def breadcrumb(*args)
+    elements = args.flatten
+    elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
+  end
+
+  def html_title(*args)
+    if args.empty?
+      title = []
+      title << @project.name if @project
+      title += @html_title if @html_title
+      title << Setting.app_title
+      title.compact.join(' - ')
+    else
+      @html_title ||= []
+      @html_title += args
+    end
+  end
+
+  def accesskey(s)
+    Redmine::AccessKeys.key_for s
+  end
+
+  # Formats text according to system settings.
+  # 2 ways to call this method:
+  # * with a String: textilizable(text, options)
+  # * with an object and one of its attribute: textilizable(issue, :description, options)
+  def textilizable(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    case args.size
+    when 1
+      obj = options[:object]
+      text = args.shift
+    when 2
+      obj = args.shift
+      text = obj.send(args.shift).to_s
+    else
+      raise ArgumentError, 'invalid arguments to textilizable'
+    end
+    return '' if text.blank?
+
+    only_path = options.delete(:only_path) == false ? false : true
+
+    # when using an image link, try to use an attachment, if possible
+    attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
+
+    if attachments
+      attachments = attachments.sort_by(&:created_on).reverse
+      text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
+        style = $1
+        filename = $6
+        rf = Regexp.new(Regexp.escape(filename),  Regexp::IGNORECASE)
+        # search for the picture in attachments
+        if found = attachments.detect { |att| att.filename =~ rf }
+          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
+          desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
+          alt = desc.blank? ? nil : "(#{desc})"
+          "!#{style}#{image_url}#{alt}!"
+        else
+          "!#{style}#{filename}!"
+        end
+      end
+    end
+
+    text = Redmine::WikiFormatting.to_html(Setting.text_formatting, text) { |macro, args| exec_macro(macro, obj, args) }
+
     # different methods for formatting wiki links
     case options[:wiki_links]
     when :local
       # used for local links to html files
-      format_wiki_link = Proc.new {|title| "#{title}.html" }
+      format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
     when :anchor
       # used for single-file wiki export
-      format_wiki_link = Proc.new {|title| "##{title}" }
+      format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
     else
-      if @project
-        format_wiki_link = Proc.new {|title| url_for :controller => 'wiki', :action => 'index', :id => @project, :page => title }
+      format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
+    end
+
+    project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
+
+    # Wiki links
+    #
+    # Examples:
+    #   [[mypage]]
+    #   [[mypage|mytext]]
+    # wiki links can refer other project wikis, using project name or identifier:
+    #   [[project:]] -> wiki starting page
+    #   [[project:|mytext]]
+    #   [[project:mypage]]
+    #   [[project:mypage|mytext]]
+    text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
+      link_project = project
+      esc, all, page, title = $1, $2, $3, $5
+      if esc.nil?
+        if page =~ /^([^\:]+)\:(.*)$/
+          link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
+          page = $2
+          title ||= $1 if page.blank?
+        end
+
+        if link_project && link_project.wiki
+          # extract anchor
+          anchor = nil
+          if page =~ /^(.+?)\#(.+)$/
+            page, anchor = $1, $2
+          end
+          # check if page exists
+          wiki_page = link_project.wiki.find_page(page)
+          link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
+                                   :class => ('wiki-page' + (wiki_page ? '' : ' new')))
+        else
+          # project or wiki doesn't exist
+          title || page
+        end
       else
-        format_wiki_link = Proc.new {|title| title }
+        all
       end
     end
-    
-    # turn wiki links into textile links: 
-    # example:
-    #   [[link]] -> "link":link
-    #   [[link|title]] -> "title":link
-    text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) {|m| "\"#{$3 || $1}\":" + format_wiki_link.call(Wiki.titleize($1)) }
 
-    # turn issue ids to textile links
-    # example:
-    #   #52 -> "#52":/issues/show/52
-    text = text.gsub(/#(\d+)(?=\b)/) {|m| "\"##{$1}\":" + url_for(:controller => 'issues', :action => 'show', :id => $1) }
-       
-    # turn revision ids to textile links (@project needed)
-    # example:
-    #   r52 -> "r52":/repositories/revision/6?rev=52 (@project.id is 6)
-    text = text.gsub(/(?=\b)r(\d+)(?=\b)/) {|m| "\"r#{$1}\":" + url_for(:controller => 'repositories', :action => 'revision', :id => @project.id, :rev => $1) } if @project
-   
-    # finally textilize text
-    @do_textilize ||= (Setting.text_formatting == 'textile') && (ActionView::Helpers::TextHelper.method_defined? "textilize")
-    text = @do_textilize ? auto_link(RedCloth.new(text).to_html) : simple_format(auto_link(h(text)))
+    # Redmine links
+    #
+    # Examples:
+    #   Issues:
+    #     #52 -> Link to issue #52
+    #   Changesets:
+    #     r52 -> Link to revision 52
+    #     commit:a85130f -> Link to scmid starting with a85130f
+    #   Documents:
+    #     document#17 -> Link to document with id 17
+    #     document:Greetings -> Link to the document with title "Greetings"
+    #     document:"Some document" -> Link to the document with title "Some document"
+    #   Versions:
+    #     version#3 -> Link to version with id 3
+    #     version:1.0.0 -> Link to version named "1.0.0"
+    #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
+    #   Attachments:
+    #     attachment:file.zip -> Link to the attachment of the current object named file.zip
+    #   Source files:
+    #     source:some/file -> Link to the file located at /some/file in the project's repository
+    #     source:some/file@52 -> Link to the file's revision 52
+    #     source:some/file#L120 -> Link to line 120 of the file
+    #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
+    #     export:some/file -> Force the download of the file
+    #  Forum messages:
+    #     message#1218 -> Link to message with id 1218
+    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
+      leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
+      link = nil
+      if esc.nil?
+        if prefix.nil? && sep == 'r'
+          if project && (changeset = project.changesets.find_by_revision(oid))
+            link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
+                                      :class => 'changeset',
+                                      :title => truncate_single_line(changeset.comments, 100))
+          end
+        elsif sep == '#'
+          oid = oid.to_i
+          case prefix
+          when nil
+            if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))
+              link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
+                                        :class => (issue.closed? ? 'issue closed' : 'issue'),
+                                        :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
+              link = content_tag('del', link) if issue.closed?
+            end
+          when 'document'
+            if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+              link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                :class => 'document'
+            end
+          when 'version'
+            if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+              link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                              :class => 'version'
+            end
+          when 'message'
+            if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
+              link = link_to h(truncate(message.subject, 60)), {:only_path => only_path,
+                                                                :controller => 'messages',
+                                                                :action => 'show',
+                                                                :board_id => message.board,
+                                                                :id => message.root,
+                                                                :anchor => (message.parent ? "message-#{message.id}" : nil)},
+                                                 :class => 'message'
+            end
+          end
+        elsif sep == ':'
+          # removes the double quotes if any
+          name = oid.gsub(%r{^"(.*)"$}, "\\1")
+          case prefix
+          when 'document'
+            if project && document = project.documents.find_by_title(name)
+              link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                :class => 'document'
+            end
+          when 'version'
+            if project && version = project.versions.find_by_name(name)
+              link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                              :class => 'version'
+            end
+          when 'commit'
+            if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
+              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
+                                           :class => 'changeset',
+                                           :title => truncate_single_line(changeset.comments, 100)
+            end
+          when 'source', 'export'
+            if project && project.repository
+              name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
+              path, rev, anchor = $1, $3, $5
+              link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
+                                                      :path => to_path_param(path),
+                                                      :rev => rev,
+                                                      :anchor => anchor,
+                                                      :format => (prefix == 'export' ? 'raw' : nil)},
+                                                     :class => (prefix == 'export' ? 'source download' : 'source')
+            end
+          when 'attachment'
+            if attachments && attachment = attachments.detect {|a| a.filename == name }
+              link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
+                                                     :class => 'attachment'
+            end
+          end
+        end
+      end
+      leading + (link || "#{prefix}#{sep}#{oid}")
+    end
+
+    text
   end
-  
+
+  # Same as Rails' simple_format helper without using paragraphs
+  def simple_format_without_paragraph(text)
+    text.to_s.
+      gsub(/\r\n?/, "\n").                    # \r\n and \r -> \n
+      gsub(/\n\n+/, "<br /><br />").          # 2+ newline  -> 2 br
+      gsub(/([^\n]\n)(?=[^\n])/, '\1<br />')  # 1 newline   -> br
+  end
+
   def error_messages_for(object_name, options = {})
     options = options.symbolize_keys
     object = instance_variable_get("@#{object_name}")
@@ -159,17 +487,17 @@ module ApplicationHelper
       end
       # retrieve custom values error messages
       if object.errors[:custom_values]
-        object.custom_values.each do |v| 
+        object.custom_values.each do |v|
           v.errors.each do |attr, msg|
             next if msg.nil?
             msg = msg.first if msg.is_a? Array
             full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
           end
         end
-      end      
+      end
       content_tag("div",
         content_tag(
-          options[:header_tag] || "h2", lwr(:gui_validation_error, full_messages.length) + " :"
+          options[:header_tag] || "span", lwr(:gui_validation_error, full_messages.length) + ":"
         ) +
         content_tag("ul", full_messages.collect { |msg| content_tag("li", msg) }),
         "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
@@ -178,64 +506,112 @@ module ApplicationHelper
       ""
     end
   end
-  
+
   def lang_options_for_select(blank=true)
-    (blank ? [["(auto)", ""]] : []) + 
-      (GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }).collect {|lang| [ l_lang_name(lang.to_s, lang), lang.to_s]}
+    (blank ? [["(auto)", ""]] : []) +
+      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
   end
-  
+
   def label_tag_for(name, option_tags = nil, options = {})
     label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
     content_tag("label", label_text)
   end
-  
+
   def labelled_tabular_form_for(name, object, options, &proc)
     options[:html] ||= {}
-    options[:html].store :class, "tabular"
+    options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
     form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
   end
-  
+
+  def back_url_hidden_field_tag
+    back_url = params[:back_url] || request.env['HTTP_REFERER']
+    hidden_field_tag('back_url', back_url) unless back_url.blank?
+  end
+
   def check_all_links(form_name)
     link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
     " | " +
-    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
+    link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")
   end
-  
+
+  def progress_bar(pcts, options={})
+    pcts = [pcts, pcts] unless pcts.is_a?(Array)
+    pcts[1] = pcts[1] - pcts[0]
+    pcts << (100 - pcts[1] - pcts[0])
+    width = options[:width] || '100px;'
+    legend = options[:legend] || ''
+    content_tag('table',
+      content_tag('tr',
+        (pcts[0] > 0 ? content_tag('td', '', :style => "width: #{pcts[0].floor}%;", :class => 'closed') : '') +
+        (pcts[1] > 0 ? content_tag('td', '', :style => "width: #{pcts[1].floor}%;", :class => 'done') : '') +
+        (pcts[2] > 0 ? content_tag('td', '', :style => "width: #{pcts[2].floor}%;", :class => 'todo') : '')
+      ), :class => 'progress', :style => "width: #{width};") +
+      content_tag('p', legend, :class => 'pourcent')
+  end
+
+  def context_menu_link(name, url, options={})
+    options[:class] ||= ''
+    if options.delete(:selected)
+      options[:class] << ' icon-checked disabled'
+      options[:disabled] = true
+    end
+    if options.delete(:disabled)
+      options.delete(:method)
+      options.delete(:confirm)
+      options.delete(:onclick)
+      options[:class] << ' disabled'
+      url = '#'
+    end
+    link_to name, url, options
+  end
+
   def calendar_for(field_id)
+    include_calendar_headers_tags
     image_tag("calendar.png", {:id => "#{field_id}_trigger",:class => "calendar-trigger"}) +
     javascript_tag("Calendar.setup({inputField : '#{field_id}', ifFormat : '%Y-%m-%d', button : '#{field_id}_trigger' });")
   end
-end
 
-class TabularFormBuilder < ActionView::Helpers::FormBuilder
-  include GLoc
-  
-  def initialize(object_name, object, template, options, proc)
-    set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
-  end      
-      
-  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
-    src = <<-END_SRC
-    def #{selector}(field, options = {}) 
-      return super if options.delete :no_label
-      label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-      label = @template.content_tag("label", label_text, 
-                    :class => (@object && @object.errors[field] ? "error" : nil), 
-                    :for => (@object_name.to_s + "_" + field.to_s))
-      label + super
+  def include_calendar_headers_tags
+    unless @calendar_headers_tags_included
+      @calendar_headers_tags_included = true
+      content_for :header_tags do
+        javascript_include_tag('calendar/calendar') +
+        javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
+        javascript_include_tag('calendar/calendar-setup') +
+        stylesheet_link_tag('calendar')
+      end
     end
-    END_SRC
-    class_eval src, __FILE__, __LINE__
-  end
-  
-  def select(field, choices, options = {}, html_options = {}) 
-    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-    label = @template.content_tag("label", label_text, 
-                  :class => (@object && @object.errors[field] ? "error" : nil), 
-                  :for => (@object_name.to_s + "_" + field.to_s))
-    label + super
   end
 
+  def content_for(name, content = nil, &block)
+    @has_content ||= {}
+    @has_content[name] = true
+    super(name, content, &block)
+  end
+
+  def has_content?(name)
+    (@has_content && @has_content[name]) || false
+  end
+
+  # Returns the avatar image tag for the given +user+ if avatars are enabled
+  # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
+  def avatar(user, options = { })
+    if Setting.gravatar_enabled?
+      email = nil
+      if user.respond_to?(:mail)
+        email = user.mail
+      elsif user.to_s =~ %r{<(.+?)>}
+        email = $1
+      end
+      return gravatar(email.to_s.downcase, options) unless email.blank? rescue nil
+    end
+  end
+
+  private
+
+  def wiki_helper
+    helper = Redmine::WikiFormatting.helper_for(Setting.text_formatting)
+    extend helper
+    return self
+  end
 end
-

app/helpers/attachments_helper.rb

@@ -0,0 +1,29 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 AttachmentsHelper
+  # displays the links to a collection of attachments
+  def link_to_attachments(attachments, options = {})
+    if attachments.any?
+      render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
+    end
+  end
+  
+  def to_utf8(str)
+    str
+  end
+end

app/helpers/boards_helper.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -15,5 +15,5 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module FeedsHelper
+module BoardsHelper
 end

app/helpers/custom_fields_helper.rb

@@ -17,38 +17,49 @@
 
 module CustomFieldsHelper
 
+  def custom_fields_tabs
+    tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
+            {:name => 'TimeEntryCustomField', :label => :label_spent_time},
+            {:name => 'ProjectCustomField', :label => :label_project_plural},
+            {:name => 'UserCustomField', :label => :label_user_plural}
+            ]
+  end
+  
   # Return custom field html tag corresponding to its format
-  def custom_field_tag(custom_value)	
+  def custom_field_tag(name, custom_value)	
     custom_field = custom_value.custom_field
-    field_name = "custom_fields[#{custom_field.id}]"
-    field_id = "custom_fields_#{custom_field.id}"
+    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
+    field_id = "#{name}_custom_field_values_#{custom_field.id}"
     
     case custom_field.field_format
-    when "string", "int"
-      text_field 'custom_value', 'value', :name => field_name, :id => field_id
     when "date"
-      text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
+      text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + 
       calendar_for(field_id)
     when "text"
-      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
+      text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
     when "bool"
-      check_box 'custom_value', 'value', :name => field_name, :id => field_id
+      check_box_tag(field_name, '1', custom_value.true?, :id => field_id) + hidden_field_tag(field_name, '0')
     when "list"
-      select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
+      blank_option = custom_field.is_required? ?
+                       (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') : 
+                       '<option></option>'
+      select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
+    else
+      text_field_tag(field_name, custom_value.value, :id => field_id)
     end
   end
   
   # Return custom field label tag
-  def custom_field_label_tag(custom_value)
+  def custom_field_label_tag(name, custom_value)
     content_tag "label", custom_value.custom_field.name +
 	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
-	:for => "custom_fields_#{custom_value.custom_field.id}",
+	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
 	:class => (custom_value.errors.empty? ? nil : "error" )
   end
   
   # Return custom field tag with its label tag
-  def custom_field_tag_with_label(custom_value)
-    custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
+  def custom_field_tag_with_label(name, custom_value)
+    custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
   end
 
   # Return a string used to display a custom value
@@ -62,7 +73,7 @@ module CustomFieldsHelper
     return "" unless value && !value.empty?
     case field_format
     when "date"
-      begin; l_date(value.to_date); rescue; value end
+      begin; format_date(value.to_date); rescue; value end
     when "bool"
       l_YesNo(value == "1")
     else

app/helpers/ifpdf_helper.rb

@@ -27,13 +27,18 @@ module IfpdfHelper
     def initialize(lang)
       super()
       set_language_if_valid lang
-      case current_language
-      when :ja
+      case current_language.to_s
+      when 'ja'
         extend(PDF_Japanese)
         AddSJISFont()
         @font_for_content = 'SJIS'
         @font_for_footer = 'SJIS'
-      when :zh
+      when 'zh'
+        extend(PDF_Chinese)
+        AddGBFont()
+        @font_for_content = 'GB'
+        @font_for_footer = 'GB'
+      when 'zh-tw'
         extend(PDF_Chinese)
         AddBig5Font()
         @font_for_content = 'Big5'
@@ -42,7 +47,7 @@ module IfpdfHelper
         @font_for_content = 'Arial'
         @font_for_footer = 'Helvetica'              
       end
-      SetCreator("redMine #{Redmine::VERSION}")
+      SetCreator(Redmine::Info.app_name)
       SetFont(@font_for_content)
     end
     
@@ -52,11 +57,16 @@ module IfpdfHelper
       
     def Cell(w,h=0,txt='',border=0,ln=0,align='',fill=0,link='')
       @ic ||= Iconv.new(l(:general_pdf_encoding), 'UTF-8')
+      # these quotation marks are not correctly rendered in the pdf
+      txt = txt.gsub(/[“”]/, '"') if txt
       txt = begin
-        @ic.iconv(txt)
+        # 0x5c char handling
+        txtar = txt.split('\\')
+        txtar << '' if txt[-1] == ?\\
+        txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
       rescue
         txt
-      end
+      end || ''
       super w,h,txt,border,ln,align,fill,link
     end
     

app/helpers/issue_relations_helper.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -15,10 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-class IssueHistory < ActiveRecord::Base
-	belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
-	belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
-	belongs_to :issue
-	
-	validates_presence_of :status
+module IssueRelationsHelper
+  def collection_for_relation_type_select
+    values = IssueRelation::TYPES
+    values.keys.sort{|x,y| values[x][:order] <=> values[y][:order]}.collect{|k| [l(values[k][:name]), k]}
+  end
 end

app/helpers/issues_helper.rb

@@ -15,7 +15,36 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'csv'
+
 module IssuesHelper
+  include ApplicationHelper
+
+  def render_issue_tooltip(issue)
+    @cached_label_start_date ||= l(:field_start_date)
+    @cached_label_due_date ||= l(:field_due_date)
+    @cached_label_assigned_to ||= l(:field_assigned_to)
+    @cached_label_priority ||= l(:field_priority)
+    
+    link_to_issue(issue) + ": #{h(issue.subject)}<br /><br />" +
+      "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />" +
+      "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />" +
+      "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
+      "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
+  end
+  
+  def sidebar_queries
+    unless @sidebar_queries
+      # User can see public queries and his own queries
+      visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
+      # Project specific queries and global queries
+      visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
+      @sidebar_queries = Query.find(:all, 
+                                    :order => "name ASC",
+                                    :conditions => visible.conditions)
+    end
+    @sidebar_queries
+  end
 
   def show_detail(detail, no_html=false)
     case detail.property
@@ -25,9 +54,15 @@ module IssuesHelper
       when 'due_date', 'start_date'
         value = format_date(detail.value.to_date) if detail.value
         old_value = format_date(detail.old_value.to_date) if detail.old_value
+      when 'project_id'
+        p = Project.find_by_id(detail.value) and value = p.name if detail.value
+        p = Project.find_by_id(detail.old_value) and old_value = p.name if detail.old_value
       when 'status_id'
         s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
         s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
+      when 'tracker_id'
+        t = Tracker.find_by_id(detail.value) and value = t.name if detail.value
+        t = Tracker.find_by_id(detail.old_value) and old_value = t.name if detail.old_value
       when 'assigned_to_id'
         u = User.find_by_id(detail.value) and value = u.name if detail.value
         u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value
@@ -40,6 +75,9 @@ module IssuesHelper
       when 'fixed_version_id'
         v = Version.find_by_id(detail.value) and value = v.name if detail.value
         v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
+      when 'estimated_hours'
+        value = "%0.02f" % detail.value.to_f unless detail.value.blank?
+        old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
       end
     when 'cf'
       custom_field = CustomField.find_by_id(detail.prop_key)
@@ -51,7 +89,8 @@ module IssuesHelper
     when 'attachment'
       label = l(:label_attachment)
     end
-       
+    call_hook(:helper_issues_show_detail_after_setting, {:detail => detail, :label => label, :value => value, :old_value => old_value })
+
     label ||= detail.prop_key
     value ||= detail.value
     old_value ||= detail.old_value
@@ -60,13 +99,18 @@ module IssuesHelper
       label = content_tag('strong', label)
       old_value = content_tag("i", h(old_value)) if detail.old_value
       old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
-      value = content_tag("i", h(value)) if value
+      if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
+        # Link to the attachment if it has not been removed
+        value = link_to_attachment(a)
+      else
+        value = content_tag("i", h(value)) if value
+      end
     end
     
-    if detail.value and !detail.value.to_s.empty?
+    if !detail.value.blank?
       case detail.property
       when 'attr', 'cf'
-        if old_value
+        if !detail.old_value.blank?
           label + " " + l(:text_journal_changed, old_value, value)
         else
           label + " " + l(:text_journal_set_to, value)
@@ -83,4 +127,62 @@ module IssuesHelper
       end
     end
   end
+  
+  def issues_to_csv(issues, project = nil)
+    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
+      # csv header fields
+      headers = [ "#",
+                  l(:field_status), 
+                  l(:field_project),
+                  l(:field_tracker),
+                  l(:field_priority),
+                  l(:field_subject),
+                  l(:field_assigned_to),
+                  l(:field_category),
+                  l(:field_fixed_version),
+                  l(:field_author),
+                  l(:field_start_date),
+                  l(:field_due_date),
+                  l(:field_done_ratio),
+                  l(:field_estimated_hours),
+                  l(:field_created_on),
+                  l(:field_updated_on)
+                  ]
+      # Export project custom fields if project is given
+      # otherwise export custom fields marked as "For all projects"
+      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_issue_custom_fields
+      custom_fields.each {|f| headers << f.name}
+      # Description in the last column
+      headers << l(:field_description)
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
+      # csv lines
+      issues.each do |issue|
+        fields = [issue.id,
+                  issue.status.name, 
+                  issue.project.name,
+                  issue.tracker.name, 
+                  issue.priority.name,
+                  issue.subject,
+                  issue.assigned_to,
+                  issue.category,
+                  issue.fixed_version,
+                  issue.author.name,
+                  format_date(issue.start_date),
+                  format_date(issue.due_date),
+                  issue.done_ratio,
+                  issue.estimated_hours.to_s.gsub('.', decimal_separator),
+                  format_time(issue.created_on),  
+                  format_time(issue.updated_on)
+                  ]
+        custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
+        fields << issue.description
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
+      end
+    end
+    export.rewind
+    export
+  end
 end

app/helpers/journals_helper.rb

@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 JournalsHelper
+  def render_notes(journal, options={})
+    content = ''
+    editable = journal.editable_by?(User.current)
+    links = []
+    if !journal.notes.blank?
+      links << link_to_remote(image_tag('comment.png'),
+                              { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
+                              :title => l(:button_quote)) if options[:reply_links]
+      links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
+                                             { :controller => 'journals', :action => 'edit', :id => journal },
+                                                :title => l(:button_edit)) if editable
+    end
+    content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
+    content << textilizable(journal, :notes)
+    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
+  end
+  
+  def link_to_in_place_notes_editor(text, field_id, url, options={})
+    onclick = "new Ajax.Request('#{url_for(url)}', {asynchronous:true, evalScripts:true, method:'get'}); return false;"
+    link_to text, '#', options.merge(:onclick => onclick)
+  end
+end

app/helpers/mail_handler_helper.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -15,5 +15,5 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-module HelpHelper
+module MailHandlerHelper
 end

app/helpers/messages_helper.rb

@@ -0,0 +1,28 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 MessagesHelper
+
+  def link_to_message(message)
+    return '' unless message
+    link_to h(truncate(message.subject, 60)), :controller => 'messages',
+                                           :action => 'show',
+                                           :board_id => message.board_id,
+                                           :id => message.root,
+                                           :anchor => (message.parent_id ? "message-#{message.id}" : nil)
+  end
+end

app/helpers/projects_helper.rb

@@ -16,14 +16,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module ProjectsHelper
-
-  def highlight_tokens(text, tokens)
-    return text unless tokens && !tokens.empty?
-    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
-    result = ''
-    text.split(regexp).each_with_index do |words, i|
-      result << (i.even? ? (words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words) : content_tag('span', words, :class => 'highlight'))
-    end
-    result
+  def link_to_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
+  end
+  
+  def project_settings_tabs
+    tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
+            {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
+            {:name => 'members', :action => :manage_members, :partial => 'projects/settings/members', :label => :label_member_plural},
+            {:name => 'versions', :action => :manage_versions, :partial => 'projects/settings/versions', :label => :label_version_plural},
+            {:name => 'categories', :action => :manage_categories, :partial => 'projects/settings/issue_categories', :label => :label_issue_category_plural},
+            {:name => 'wiki', :action => :manage_wiki, :partial => 'projects/settings/wiki', :label => :label_wiki},
+            {:name => 'repository', :action => :manage_repository, :partial => 'projects/settings/repository', :label => :label_repository},
+            {:name => 'boards', :action => :manage_boards, :partial => 'projects/settings/boards', :label => :label_board_plural}
+            ]
+    tabs.select {|tab| User.current.allowed_to?(tab[:action], @project)}     
   end
 end

app/helpers/queries_helper.rb

@@ -1,6 +1,55 @@
-module QueriesHelper
+# redMine - project management software
+# Copyright (C) 2006-2007  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 QueriesHelper
+  
   def operators_for_select(filter_type)
     Query.operators_by_filter_type[filter_type].collect {|o| [l(Query.operators[o]), o]}
   end
+  
+  def column_header(column)
+    column.sortable ? sort_header_tag(column.sortable, :caption => column.caption,
+                                                       :default_order => column.default_order) : 
+                      content_tag('th', column.caption)
+  end
+  
+  def column_content(column, issue)
+    if column.is_a?(QueryCustomFieldColumn)
+      cv = issue.custom_values.detect {|v| v.custom_field_id == column.custom_field.id}
+      show_value(cv)
+    else
+      value = issue.send(column.name)
+      if value.is_a?(Date)
+        format_date(value)
+      elsif value.is_a?(Time)
+        format_time(value)
+      else
+        case column.name
+        when :subject
+        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
+          link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
+        when :done_ratio
+          progress_bar(value, :width => '80px')
+        when :fixed_version
+          link_to(h(value), { :controller => 'versions', :action => 'show', :id => issue.fixed_version_id })
+        else
+          h(value)
+        end
+      end
+    end
+  end
 end

app/helpers/reports_helper.rb

@@ -22,11 +22,15 @@ module ReportsHelper
     data.each { |row|
       match = 1
       criteria.each { |k, v|
-        match = 0 unless row[k].to_s == v.to_s
+        match = 0 unless (row[k].to_s == v.to_s) || (k == 'closed' && row[k] == (v == 0 ? "f" : "t"))
       } unless criteria.nil?
       a = a + row["total"].to_i if match == 1
     } unless data.nil?
     a
   end
   
+  def aggregate_link(data, criteria, *args)
+    a = aggregate data, criteria
+    a > 0 ? link_to(a, *args) : '-'
+  end  
 end

app/helpers/repositories_helper.rb

@@ -15,5 +15,168 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'iconv'
+
 module RepositoriesHelper
+  def format_revision(txt)
+    txt.to_s[0,8]
+  end
+  
+  def truncate_at_line_break(text, length = 255)
+    if text
+      text.gsub(%r{^(.{#{length}}[^\n]*)\n.+$}m, '\\1...')
+    end
+  end
+  
+  def render_properties(properties)
+    unless properties.nil? || properties.empty?
+      content = ''
+      properties.keys.sort.each do |property|
+        content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
+      end
+      content_tag('ul', content, :class => 'properties')
+    end
+  end
+  
+  def render_changeset_changes
+    changes = @changeset.changes.find(:all, :limit => 1000, :order => 'path').collect do |change|
+      case change.action
+      when 'A'
+        # Detects moved/copied files
+        if !change.from_path.blank?
+          change.action = @changeset.changes.detect {|c| c.action == 'D' && c.path == change.from_path} ? 'R' : 'C'
+        end
+        change
+      when 'D'
+        @changeset.changes.detect {|c| c.from_path == change.path} ? nil : change
+      else
+        change
+      end
+    end.compact
+    
+    tree = { }
+    changes.each do |change|
+      p = tree
+      dirs = change.path.to_s.split('/').select {|d| !d.blank?}
+      dirs.each do |dir|
+        p[:s] ||= {}
+        p = p[:s]
+        p[dir] ||= {}
+        p = p[dir]
+      end
+      p[:c] = change
+    end
+    
+    render_changes_tree(tree[:s])
+  end
+  
+  def render_changes_tree(tree)
+    return '' if tree.nil?
+    
+    output = ''
+    output << '<ul>'
+    tree.keys.sort.each do |file|
+      s = !tree[file][:s].nil?
+      c = tree[file][:c]
+      
+      style = 'change'
+      style << ' folder' if s
+      style << " change-#{c.action}" if c
+      
+      text = h(file)
+      unless c.nil?
+        path_param = to_path_param(@repository.relative_path(c.path))
+        text = link_to(text, :controller => 'repositories',
+                             :action => 'entry',
+                             :id => @project,
+                             :path => path_param,
+                             :rev => @changeset.revision) unless s || c.action == 'D'
+        text << " - #{c.revision}" unless c.revision.blank?
+        text << ' (' + link_to('diff', :controller => 'repositories',
+                                       :action => 'diff',
+                                       :id => @project,
+                                       :path => path_param,
+                                       :rev => @changeset.revision) + ') ' if c.action == 'M'
+        text << ' ' + content_tag('span', c.from_path, :class => 'copied-from') unless c.from_path.blank?
+      end
+      output << "<li class='#{style}'>#{text}</li>"
+      output << render_changes_tree(tree[file][:s]) if s
+    end
+    output << '</ul>'
+    output
+  end
+  
+  def to_utf8(str)
+    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+    @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
+    @encodings.each do |encoding|
+      begin
+        return Iconv.conv('UTF-8', encoding, str)
+      rescue Iconv::Failure
+        # do nothing here and try the next encoding
+      end
+    end
+    str
+  end
+  
+  def repository_field_tags(form, repository)    
+    method = repository.class.name.demodulize.underscore + "_field_tags"
+    send(method, form, repository) if repository.is_a?(Repository) && respond_to?(method)
+  end
+  
+  def scm_select_tag(repository)
+    scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
+    REDMINE_SUPPORTED_SCM.each do |scm|
+      scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
+    end
+    
+    select_tag('repository_scm', 
+               options_for_select(scm_options, repository.class.name.demodulize),
+               :disabled => (repository && !repository.new_record?),
+               :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
+               )
+  end
+  
+  def with_leading_slash(path)
+    path.to_s.starts_with?('/') ? path : "/#{path}"
+  end
+  
+  def without_leading_slash(path)
+    path.gsub(%r{^/+}, '')
+  end
+
+  def subversion_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
+                       '<br />(http://, https://, svn://, file:///)') +
+      content_tag('p', form.text_field(:login, :size => 30)) +
+      content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
+                                           :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='repository[password]';",
+                                           :onchange => "this.name='repository[password]';"))
+  end
+
+  def darcs_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
+  end
+  
+  def mercurial_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
+  end
+
+  def git_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Path to .git directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
+  end
+
+  def cvs_field_tags(form, repository)
+      content_tag('p', form.text_field(:root_url, :label => 'CVSROOT', :size => 60, :required => true, :disabled => !repository.new_record?)) +
+      content_tag('p', form.text_field(:url, :label => 'Module', :size => 30, :required => true, :disabled => !repository.new_record?))
+  end
+
+  def bazaar_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
+  end
+  
+  def filesystem_field_tags(form, repository)
+    content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
+  end
 end

app/helpers/search_helper.rb

@@ -0,0 +1,63 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 SearchHelper
+  def highlight_tokens(text, tokens)
+    return text unless text && tokens && !tokens.empty?
+    re_tokens = tokens.collect {|t| Regexp.escape(t)}
+    regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE    
+    result = ''
+    text.split(regexp).each_with_index do |words, i|
+      if result.length > 1200
+        # maximum length of the preview reached
+        result << '...'
+        break
+      end
+      if i.even?
+        result << h(words.length > 100 ? "#{words[0..44]} ... #{words[-45..-1]}" : words)
+      else
+        t = (tokens.index(words.downcase) || 0) % 4
+        result << content_tag('span', h(words), :class => "highlight token-#{t}")
+      end
+    end
+    result
+  end
+  
+  def type_label(t)
+    l("label_#{t.singularize}_plural")
+  end
+  
+  def project_select_tag
+    options = [[l(:label_project_all), 'all']]
+    options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
+    options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.active_children.empty?
+    options << [@project.name, ''] unless @project.nil?
+    select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
+  end
+  
+  def render_results_by_type(results_by_type)
+    links = []
+    # Sorts types by results count
+    results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
+      c = results_by_type[t]
+      next if c == 0
+      text = "#{type_label(t)} (#{c})"
+      links << link_to(text, :q => params[:q], :titles_only => params[:title_only], :all_words => params[:all_words], :scope => params[:scope], t => 1)
+    end
+    ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty?
+  end
+end

app/helpers/settings_helper.rb

@@ -16,4 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module SettingsHelper
+  def administration_settings_tabs
+    tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
+            {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
+            {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
+            {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
+            {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
+            {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},
+            {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
+            ]
+  end
 end

app/helpers/sort_helper.rb

@@ -83,7 +83,7 @@ module SortHelper
   # Use this to sort the controller's table items collection.
   #
   def sort_clause()
-    session[@sort_name][:key] + ' ' + session[@sort_name][:order]
+    session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
   end
 
   # Returns a link which sorts by the named column.
@@ -92,7 +92,7 @@ module SortHelper
   # - The optional caption explicitly specifies the displayed link text.
   # - A sort icon image is positioned to the right of the sort link.
   #
-  def sort_link(column, caption=nil)
+  def sort_link(column, caption, default_order)
     key, order = session[@sort_name][:key], session[@sort_name][:order]
     if key == column
       if order.downcase == 'asc'
@@ -104,15 +104,17 @@ module SortHelper
       end
     else
       icon = nil
-      order = 'desc' # changed for desc order by default
+      order = default_order
     end
     caption = titleize(Inflector::humanize(column)) unless caption
     
-    url = {:sort_key => column, :sort_order => order, :issue_id => params[:issue_id], :project_id => params[:project_id]}
+    sort_options = { :sort_key => column, :sort_order => order }
+    # don't reuse params if filters are present
+    url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
     
     link_to_remote(caption,
-                  {:update => "content", :url => url},
-                  {:href => url_for(url)}) +
+                  {:update => "content", :url => url_options},
+                  {:href => url_for(url_options)}) +
     (icon ? nbsp(2) + image_tag(icon) : '')
   end
 
@@ -137,14 +139,10 @@ module SortHelper
   #   </th>
   #
   def sort_header_tag(column, options = {})
-    if options[:caption]
-      caption = options[:caption]
-      options.delete(:caption)
-    else
-      caption = titleize(Inflector::humanize(column))
-    end
-    options[:title]= "Sort by #{caption}" unless options[:title]
-    content_tag('th', sort_link(column, caption), options)
+    caption = options.delete(:caption) || titleize(Inflector::humanize(column))
+    default_order = options.delete(:default_order) || 'asc'
+    options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
+    content_tag('th', sort_link(column, caption, default_order), options)
   end
 
   private

app/helpers/timelog_helper.rb

@@ -1,2 +1,158 @@
+# redMine - project management software
+# Copyright (C) 2006  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 TimelogHelper
+  def render_timelog_breadcrumb
+    links = []
+    links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
+    links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
+    links << link_to_issue(@issue) if @issue
+    breadcrumb links
+  end
+  
+  def activity_collection_for_select_options
+    activities = Enumeration::get_values('ACTI')
+    collection = []
+    collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
+    activities.each { |a| collection << [a.name, a.id] }
+    collection
+  end
+  
+  def select_hours(data, criteria, value)
+    data.select {|row| row[criteria] == value}
+  end
+  
+  def sum_hours(data)
+    sum = 0
+    data.each do |row|
+      sum += row['hours'].to_f
+    end
+    sum
+  end
+  
+  def options_for_period_select(value)
+    options_for_select([[l(:label_all_time), 'all'],
+                        [l(:label_today), 'today'],
+                        [l(:label_yesterday), 'yesterday'],
+                        [l(:label_this_week), 'current_week'],
+                        [l(:label_last_week), 'last_week'],
+                        [l(:label_last_n_days, 7), '7_days'],
+                        [l(:label_this_month), 'current_month'],
+                        [l(:label_last_month), 'last_month'],
+                        [l(:label_last_n_days, 30), '30_days'],
+                        [l(:label_this_year), 'current_year']],
+                        value)
+  end
+  
+  def entries_to_csv(entries)
+    ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
+    custom_fields = TimeEntryCustomField.find(:all)
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
+      # csv header fields
+      headers = [l(:field_spent_on),
+                 l(:field_user),
+                 l(:field_activity),
+                 l(:field_project),
+                 l(:field_issue),
+                 l(:field_tracker),
+                 l(:field_subject),
+                 l(:field_hours),
+                 l(:field_comments)
+                 ]
+      # Export custom fields
+      headers += custom_fields.collect(&:name)
+      
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
+      # csv lines
+      entries.each do |entry|
+        fields = [l_date(entry.spent_on),
+                  entry.user,
+                  entry.activity,
+                  entry.project,
+                  (entry.issue ? entry.issue.id : nil),
+                  (entry.issue ? entry.issue.tracker : nil),
+                  (entry.issue ? entry.issue.subject : nil),
+                  entry.hours.to_s.gsub('.', decimal_separator),
+                  entry.comments
+                  ]
+        fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
+                  
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
+      end
+    end
+    export.rewind
+    export
+  end
+  
+  def format_criteria_value(criteria, value)
+    value.blank? ? l(:label_none) : ((k = @available_criterias[criteria][:klass]) ? k.find_by_id(value.to_i) : format_value(value, @available_criterias[criteria][:format]))
+  end
+  
+  def report_to_csv(criterias, periods, hours)
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
+      # Column headers
+      headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) }
+      headers += periods
+      headers << l(:label_total)
+      csv << headers.collect {|c| to_utf8(c) }
+      # Content
+      report_criteria_to_csv(csv, criterias, periods, hours)
+      # Total row
+      row = [ l(:label_total) ] + [''] * (criterias.size - 1)
+      total = 0
+      periods.each do |period|
+        sum = sum_hours(select_hours(hours, @columns, period.to_s))
+        total += sum
+        row << (sum > 0 ? "%.2f" % sum : '')
+      end
+      row << "%.2f" %total
+      csv << row
+    end
+    export.rewind
+    export
+  end
+  
+  def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
+    hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
+      hours_for_value = select_hours(hours, criterias[level], value)
+      next if hours_for_value.empty?
+      row = [''] * level
+      row << to_utf8(format_criteria_value(criterias[level], value))
+      row += [''] * (criterias.length - level - 1)
+      total = 0
+      periods.each do |period|
+        sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s))
+        total += sum
+        row << (sum > 0 ? "%.2f" % sum : '')
+      end
+      row << "%.2f" %total
+      csv << row
+      
+      if criterias.length > level + 1
+        report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
+      end
+    end
+  end
+  
+  def to_utf8(s)
+    @ic ||= Iconv.new(l(:general_csv_encoding), 'UTF-8')
+    begin; @ic.iconv(s.to_s); rescue; s.to_s; end
+  end
 end

app/helpers/users_helper.rb

@@ -16,10 +16,43 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module UsersHelper
-  def status_options_for_select(selected)
-    options_for_select([[l(:label_all), "*"], 
-                        [l(:status_active), 1],
-                        [l(:status_registered), 2],
-                        [l(:status_locked), 3]], selected)
+  def users_status_options_for_select(selected)
+    user_count_by_status = User.count(:group => 'status').to_hash
+    options_for_select([[l(:label_all), ''], 
+                        ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1],
+                        ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2],
+                        ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected)
+  end
+  
+  # Options for the new membership projects combo-box
+  def projects_options_for_select(projects)
+    options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
+    projects_by_root = projects.group_by(&:root)
+    projects_by_root.keys.sort.each do |root|
+      options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)))
+      projects_by_root[root].sort.each do |project|
+        next if project == root
+        options << content_tag('option', '&#187; ' + h(project.name), :value => project.id)
+      end
+    end
+    options
+  end
+  
+  def change_status_link(user)
+    url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
+    
+    if user.locked?
+      link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+    elsif user.registered?
+      link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+    elsif user != User.current
+      link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
+    end
+  end
+  
+  def user_settings_tabs
+    tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
+            {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
+            ]
   end
 end

app/helpers/versions_helper.rb

@@ -16,4 +16,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module VersionsHelper
+
+  STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
+  
+  def render_issue_status_by(version, criteria)
+    criteria ||= 'category'
+    raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
+    
+    h = Hash.new {|k,v| k[v] = [0, 0]}
+    begin
+      # Total issue count
+      Issue.count(:group => criteria,
+                  :conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {|c,s| h[c][0] = s}
+      # Open issues count
+      Issue.count(:group => criteria,
+                  :include => :status,
+                  :conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {|c,s| h[c][1] = s}
+    rescue ActiveRecord::RecordNotFound
+    # When grouping by an association, Rails throws this exception if there's no result (bug)
+    end
+    counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
+    max = counts.collect {|c| c[:total]}.max
+    
+    render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
+  end
+  
+  def status_by_options_for_select(value)
+    options_for_select(STATUS_BY_CRITERIAS.collect {|criteria| [l("field_#{criteria}".to_sym), criteria]}, value)
+  end
 end

app/helpers/watchers_helper.rb

@@ -0,0 +1,41 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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 WatchersHelper
+  def watcher_tag(object, user)
+    content_tag("span", watcher_link(object, user), :id => 'watcher')
+  end
+  
+  def watcher_link(object, user)
+    return '' unless user && user.logged? && object.respond_to?('watched_by?')
+    watched = object.watched_by?(user)
+    url = {:controller => 'watchers',
+           :action => (watched ? 'unwatch' : 'watch'),
+           :object_type => object.class.to_s.underscore,
+           :object_id => object.id}           
+    link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
+                   {:url => url},
+                   :href => url_for(url),
+                   :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
+  
+  end
+  
+  # Returns a comma separated list of users watching the given object
+  def watchers_list(object)
+    object.watcher_users.collect {|u| content_tag('span', link_to_user(u), :class => 'user') }.join(",\n")
+  end
+end

app/helpers/wiki_helper.rb

@@ -16,4 +16,41 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module WikiHelper
+  
+  def html_diff(wdiff)
+    words = wdiff.words.collect{|word| h(word)}
+    words_add = 0
+    words_del = 0
+    dels = 0
+    del_off = 0
+    wdiff.diff.diffs.each do |diff|
+      add_at = nil
+      add_to = nil
+      del_at = nil
+      deleted = ""	    
+      diff.each do |change|
+        pos = change[1]
+        if change[0] == "+"
+          add_at = pos + dels unless add_at
+          add_to = pos + dels
+          words_add += 1
+        else
+          del_at = pos unless del_at
+          deleted << ' ' + change[2]
+          words_del	 += 1
+        end
+      end
+      if add_at
+        words[add_at] = '<span class="diff_in">' + words[add_at]
+        words[add_to] = words[add_to] + '</span>'
+      end
+      if del_at
+        words.insert del_at - del_off + dels + words_add, '<span class="diff_out">' + deleted + '</span>'
+        dels += 1
+        del_off += words_del
+        words_del = 0
+      end
+    end
+    simple_format_without_paragraph(words.join(' '))
+  end
 end

app/helpers/workflows_helper.rb

@@ -0,0 +1,19 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 WorkflowsHelper
+end

app/models/attachment.rb

@@ -21,8 +21,27 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   
-  validates_presence_of :container, :filename
+  validates_presence_of :container, :filename, :author
+  validates_length_of :filename, :maximum => 255
+  validates_length_of :disk_filename, :maximum => 255
+
+  acts_as_event :title => :filename,
+                :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
+
+  acts_as_activity_provider :type => 'files',
+                            :permission => :view_files,
+                            :author_key => :author_id,
+                            :find_options => {:select => "#{Attachment.table_name}.*", 
+                                              :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
   
+  acts_as_activity_provider :type => 'documents',
+                            :permission => :view_documents,
+                            :author_key => :author_id,
+                            :find_options => {:select => "#{Attachment.table_name}.*", 
+                                              :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                        "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
+
   cattr_accessor :storage_path
   @@storage_path = "#{RAILS_ROOT}/files"
   
@@ -30,63 +49,95 @@ class Attachment < ActiveRecord::Base
     errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
   end
 
-	def file=(incomming_file)
-		unless incomming_file.nil?
-			@temp_file = incomming_file
-			if @temp_file.size > 0
-				self.filename = sanitize_filename(@temp_file.original_filename)
-				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type
-				self.filesize = @temp_file.size
-			end
-		end
-	end
+  def file=(incoming_file)
+    unless incoming_file.nil?
+      @temp_file = incoming_file
+      if @temp_file.size > 0
+        self.filename = sanitize_filename(@temp_file.original_filename)
+        self.disk_filename = Attachment.disk_filename(filename)
+        self.content_type = @temp_file.content_type.to_s.chomp
+        self.filesize = @temp_file.size
+      end
+    end
+  end
 	
-	def file
-	 nil
-	end
-	
-	# Copy temp file to its final location
-	def before_save
-		if @temp_file && (@temp_file.size > 0)
-			logger.debug("saving '#{self.diskfile}'")
-			File.open(diskfile, "wb") do |f| 
-				f.write(@temp_file.read)
-			end
-			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
-		end
-	end
-	
-	# Deletes file on the disk
-	def after_destroy
-		if self.filename?
-			File.delete(diskfile) if File.exist?(diskfile)
-		end
-	end
-	
-	# Returns file's location on disk
-	def diskfile
-		"#{@@storage_path}/#{self.disk_filename}"
-	end
+  def file
+    nil
+  end
+
+  # Copy temp file to its final location
+  def before_save
+    if @temp_file && (@temp_file.size > 0)
+      logger.debug("saving '#{self.diskfile}'")
+      File.open(diskfile, "wb") do |f| 
+        f.write(@temp_file.read)
+      end
+      self.digest = self.class.digest(diskfile)
+    end
+    # Don't save the content type if it's longer than the authorized length
+    if self.content_type && self.content_type.length > 255
+      self.content_type = nil
+    end
+  end
+
+  # Deletes file on the disk
+  def after_destroy
+    File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
+  end
+
+  # Returns file's location on disk
+  def diskfile
+    "#{@@storage_path}/#{self.disk_filename}"
+  end
   
   def increment_download
     increment!(:downloads)
   end
-	
-	# returns last created projects
-	def self.most_downloaded
-		find(:all, :limit => 5, :order => "downloads DESC")	
-	end
-	
+
+  def project
+    container.project
+  end
+  
+  def image?
+    self.filename =~ /\.(jpe?g|gif|png)$/i
+  end
+  
+  def is_text?
+    Redmine::MimeType.is_type?('text', filename)
+  end
+  
+  def is_diff?
+    self.filename =~ /\.(patch|diff)$/i
+  end
+  
 private
   def sanitize_filename(value)
-      # get only the filename, not the whole path
-      just_filename = value.gsub(/^.*(\\|\/)/, '')
-      # NOTE: File.basename doesn't work right with Windows paths on Unix
-      # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
+    # get only the filename, not the whole path
+    just_filename = value.gsub(/^.*(\\|\/)/, '')
+    # NOTE: File.basename doesn't work right with Windows paths on Unix
+    # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
 
-      # Finally, replace all non alphanumeric, underscore or periods with underscore
-      @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
+    # Finally, replace all non alphanumeric, hyphens or periods with underscore
+    @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
+  end
+  
+  # Returns an ASCII or hashed filename
+  def self.disk_filename(filename)
+    df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
+    if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
+      df << filename
+    else
+      df << Digest::MD5.hexdigest(filename)
+      # keep the extension if any
+      df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
+    end
+    df
+  end
+  
+  # Returns the MD5 digest of the file at given path
+  def self.digest(filename)
+    File.open(filename, 'rb') do |f|
+      Digest::MD5.hexdigest(f.read)
+    end
   end
-    
 end

app/models/auth_source.rb

@@ -20,6 +20,7 @@ class AuthSource < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
+  validates_length_of :name, :maximum => 60
 
   def authenticate(login, password)
   end
@@ -37,7 +38,8 @@ class AuthSource < ActiveRecord::Base
       begin
         logger.debug "Authenticating '#{login}' against '#{source.name}'" if logger && logger.debug?
         attrs = source.authenticate(login, password)
-      rescue
+      rescue => e
+        logger.error "Error during authentication: #{e.message}"
         attrs = nil
       end
       return attrs if attrs

app/models/auth_source_ldap.rb

@@ -20,12 +20,19 @@ require 'iconv'
 
 class AuthSourceLdap < AuthSource 
   validates_presence_of :host, :port, :attr_login
-
+  validates_length_of :name, :host, :account_password, :maximum => 60, :allow_nil => true
+  validates_length_of :account, :base_dn, :maximum => 255, :allow_nil => true
+  validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
+  validates_numericality_of :port, :only_integer => true
+  
+  before_validation :strip_ldap_attributes
+  
   def after_initialize
     self.port = 389 if self.port == 0
   end
   
   def authenticate(login, password)
+    return nil if login.blank? || password.blank?
     attrs = []
     # get user's DN
     ldap_con = initialize_ldap_con(self.account, self.account_password)
@@ -34,12 +41,13 @@ class AuthSourceLdap < AuthSource
     dn = String.new
     ldap_con.search( :base => self.base_dn, 
                      :filter => object_filter & login_filter, 
-                     :attributes=> ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail]) do |entry|
+                     # only ask for the DN if on-the-fly registration is disabled
+                     :attributes=> (onthefly_register? ? ['dn', self.attr_firstname, self.attr_lastname, self.attr_mail] : ['dn'])) do |entry|
       dn = entry.dn
       attrs = [:firstname => AuthSourceLdap.get_attr(entry, self.attr_firstname),
                :lastname => AuthSourceLdap.get_attr(entry, self.attr_lastname),
                :mail => AuthSourceLdap.get_attr(entry, self.attr_mail),
-               :auth_source_id => self.id ]
+               :auth_source_id => self.id ] if onthefly_register?
     end
     return nil if dn.empty?
     logger.debug "DN found for #{login}: #{dn}" if logger && logger.debug?
@@ -65,15 +73,26 @@ class AuthSourceLdap < AuthSource
     "LDAP"
   end
   
-private
+  private
+  
+  def strip_ldap_attributes
+    [:attr_login, :attr_firstname, :attr_lastname, :attr_mail].each do |attr|
+      write_attribute(attr, read_attribute(attr).strip) unless read_attribute(attr).nil?
+    end
+  end
+  
   def initialize_ldap_con(ldap_user, ldap_password)
-    Net::LDAP.new( {:host => self.host, 
-                    :port => self.port, 
-                    :auth => { :method => :simple, :username => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_user), :password => Iconv.new('iso-8859-15', 'utf-8').iconv(ldap_password) }} 
-    ) 
+    options = { :host => self.host,
+                :port => self.port,
+                :encryption => (self.tls ? :simple_tls : nil)
+              }
+    options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
+    Net::LDAP.new options
   end
   
   def self.get_attr(entry, attr_name)
-    entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+    if !attr_name.blank?
+      entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+    end
   end
 end

app/models/board.rb

@@ -0,0 +1,29 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class Board < ActiveRecord::Base
+  belongs_to :project
+  has_many :topics, :class_name => 'Message', :conditions => "#{Message.table_name}.parent_id IS NULL", :order => "#{Message.table_name}.created_on DESC"
+  has_many :messages, :dependent => :delete_all, :order => "#{Message.table_name}.created_on DESC"
+  belongs_to :last_message, :class_name => 'Message', :foreign_key => :last_message_id
+  acts_as_list :scope => :project_id
+  acts_as_watchable
+  
+  validates_presence_of :name, :description
+  validates_length_of :name, :maximum => 30
+  validates_length_of :description, :maximum => 255
+end

app/models/change.rb

@@ -19,4 +19,8 @@ class Change < ActiveRecord::Base
   belongs_to :changeset
   
   validates_presence_of :changeset_id, :action, :path
+  
+  def relative_path
+    changeset.repository.relative_path(path)
+  end
 end

app/models/changeset.rb

@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -15,16 +15,141 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'iconv'
+
 class Changeset < ActiveRecord::Base
   belongs_to :repository
+  belongs_to :user
   has_many :changes, :dependent => :delete_all
+  has_and_belongs_to_many :issues
+
+  acts_as_event :title => Proc.new {|o| "#{l(:label_revision)} #{o.revision}" + (o.comments.blank? ? '' : (': ' + o.comments))},
+                :description => :comments,
+                :datetime => :committed_on,
+                :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
+                
+  acts_as_searchable :columns => 'comments',
+                     :include => {:repository => :project},
+                     :project_key => "#{Repository.table_name}.project_id",
+                     :date_column => 'committed_on'
+                     
+  acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
+                            :author_key => :user_id,
+                            :find_options => {:include => {:repository => :project}}
   
   validates_presence_of :repository_id, :revision, :committed_on, :commit_date
-  validates_numericality_of :revision, :only_integer => true
   validates_uniqueness_of :revision, :scope => :repository_id
+  validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
   
+  def revision=(r)
+    write_attribute :revision, (r.nil? ? nil : r.to_s)
+  end
+  
+  def comments=(comment)
+    write_attribute(:comments, Changeset.normalize_comments(comment))
+  end
+
   def committed_on=(date)
     self.commit_date = date
     super
   end
+  
+  def project
+    repository.project
+  end
+  
+  def author
+    user || committer.to_s.split('<').first
+  end
+  
+  def before_create
+    self.user = repository.find_committer_user(committer)
+  end
+  
+  def after_create
+    scan_comment_for_issue_ids
+  end
+  require 'pp'
+  
+  def scan_comment_for_issue_ids
+    return if comments.blank?
+    # keywords used to reference issues
+    ref_keywords = Setting.commit_ref_keywords.downcase.split(",").collect(&:strip)
+    # keywords used to fix issues
+    fix_keywords = Setting.commit_fix_keywords.downcase.split(",").collect(&:strip)
+    # status and optional done ratio applied
+    fix_status = IssueStatus.find_by_id(Setting.commit_fix_status_id)
+    done_ratio = Setting.commit_fix_done_ratio.blank? ? nil : Setting.commit_fix_done_ratio.to_i
+    
+    kw_regexp = (ref_keywords + fix_keywords).collect{|kw| Regexp.escape(kw)}.join("|")
+    return if kw_regexp.blank?
+    
+    referenced_issues = []
+    
+    if ref_keywords.delete('*')
+      # find any issue ID in the comments
+      target_issue_ids = []
+      comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+      referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
+    end
+    
+    comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
+      action = match[0]
+      target_issue_ids = match[1].scan(/\d+/)
+      target_issues = repository.project.issues.find_all_by_id(target_issue_ids)
+      if fix_status && fix_keywords.include?(action.downcase)
+        # update status of issues
+        logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
+        target_issues.each do |issue|
+          # the issue may have been updated by the closure of another one (eg. duplicate)
+          issue.reload
+          # don't change the status is the issue is closed
+          next if issue.status.is_closed?
+          csettext = "r#{self.revision}"
+          if self.scmid && (! (csettext =~ /^r[0-9]+$/))
+            csettext = "commit:\"#{self.scmid}\""
+          end
+          journal = issue.init_journal(user || User.anonymous, l(:text_status_changed_by_changeset, csettext))
+          issue.status = fix_status
+          issue.done_ratio = done_ratio if done_ratio
+          issue.save
+          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+        end
+      end
+      referenced_issues += target_issues
+    end
+    
+    self.issues = referenced_issues.uniq
+  end
+  
+  # Returns the previous changeset
+  def previous
+    @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
+  end
+
+  # Returns the next changeset
+  def next
+    @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
+  end
+  
+  # Strips and reencodes a commit log before insertion into the database
+  def self.normalize_comments(str)
+    to_utf8(str.to_s.strip)
+  end
+  
+  private
+
+
+  def self.to_utf8(str)
+    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+    encoding = Setting.commit_logs_encoding.to_s.strip
+    unless encoding.blank? || encoding == 'UTF-8'
+      begin
+        return Iconv.conv('UTF-8', encoding, str)
+      rescue Iconv::Failure
+        # do nothing here
+      end
+    end
+    str
+  end
 end

app/models/comment.rb

@@ -19,5 +19,5 @@ class Comment < ActiveRecord::Base
   belongs_to :commented, :polymorphic => true, :counter_cache => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
-  validates_presence_of :commented, :author, :comment
+  validates_presence_of :commented, :author, :comments
 end

app/models/custom_field.rb

@@ -17,19 +17,22 @@
 
 class CustomField < ActiveRecord::Base
   has_many :custom_values, :dependent => :delete_all
+  acts_as_list :scope => 'type = \'#{self.class}\''
   serialize :possible_values
   
   FIELD_FORMATS = { "string" => { :name => :label_string, :order => 1 },
                     "text" => { :name => :label_text, :order => 2 },
                     "int" => { :name => :label_integer, :order => 3 },
-                    "list" => { :name => :label_list, :order => 4 },
-			        "date" => { :name => :label_date, :order => 5 },
-			        "bool" => { :name => :label_boolean, :order => 6 }
+                    "float" => { :name => :label_float, :order => 4 },
+                    "list" => { :name => :label_list, :order => 5 },
+			        "date" => { :name => :label_date, :order => 6 },
+			        "bool" => { :name => :label_boolean, :order => 7 }
   }.freeze
 
   validates_presence_of :name, :field_format
-  validates_uniqueness_of :name
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_uniqueness_of :name, :scope => :type
+  validates_length_of :name, :maximum => 30
+  validates_format_of :name, :with => /^[\w\s\.\'\-]*$/i
   validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
 
   def initialize(attributes = nil)
@@ -40,6 +43,9 @@ class CustomField < ActiveRecord::Base
   def before_validation
     # remove empty values
     self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
+    # make sure these fields are not searchable
+    self.searchable = false if %w(int float date bool).include?(field_format)
+    true
   end
   
   def validate
@@ -47,11 +53,20 @@ class CustomField < ActiveRecord::Base
       errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
       errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
     end
+    
+    # validate default value
+    v = CustomValue.new(:custom_field => self.clone, :value => default_value, :customized => nil)
+    v.custom_field.is_required = false
+    errors.add(:default_value, :activerecord_error_invalid) unless v.valid?
   end
 
+  def <=>(field)
+    position <=> field.position
+  end
+  
   # to move in project_custom_field
   def self.for_all
-    find(:all, :conditions => ["is_for_all=?", true])
+    find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
   end
   
   def type_name

app/models/custom_value.rb

@@ -19,20 +19,37 @@ class CustomValue < ActiveRecord::Base
   belongs_to :custom_field
   belongs_to :customized, :polymorphic => true
 
+  def after_initialize
+    if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
+      self.value ||= custom_field.default_value
+    end
+  end
+  
+  # Returns true if the boolean custom value is true
+  def true?
+    self.value == '1'
+  end
+  
 protected
   def validate
-    errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.empty?    
-    errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.empty? or value =~ Regexp.new(custom_field.regexp)
-    errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
-    errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
-    case custom_field.field_format
-    when "int"
-      errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[0-9]*$/	
-    when "date"
-      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
-    when "list"
-      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
+    if value.blank?
+      errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?    
+    else
+      errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
+      errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
+      errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+    
+      # Format specific validations
+      case custom_field.field_format
+      when 'int'
+        errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/	
+      when 'float'
+        begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+      when 'date'
+        errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
+      when 'list'
+        errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
+      end
     end
   end
 end
-

app/models/document.rb

@@ -20,5 +20,12 @@ class Document < ActiveRecord::Base
   belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
   has_many :attachments, :as => :container, :dependent => :destroy
 
+  acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
+  acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
+                :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
+                :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
+  acts_as_activity_provider :find_options => {:include => :project}
+  
   validates_presence_of :project, :title, :category
+  validates_length_of :title, :maximum => 60
 end

app/models/enabled_module.rb

@@ -0,0 +1,23 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class EnabledModule < ActiveRecord::Base
+  belongs_to :project
+  
+  validates_presence_of :name
+  validates_uniqueness_of :name, :scope => :project_id
+end

app/models/enumeration.rb

@@ -16,35 +16,64 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Enumeration < ActiveRecord::Base
+  acts_as_list :scope => 'opt = \'#{opt}\''
+
   before_destroy :check_integrity
   
   validates_presence_of :opt, :name
   validates_uniqueness_of :name, :scope => [:opt]
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-	
-	OPTIONS = {
-	  "IPRI" => :enumeration_issue_priorities,
-      "DCAT" => :enumeration_doc_categories,
-      "ACTI" => :enumeration_activities
-	}.freeze
-	
-	def self.get_values(option)
-		find(:all, :conditions => ['opt=?', option])
-	end
-	
-  def option_name
-    OPTIONS[self.opt]
+  validates_length_of :name, :maximum => 30
+
+  # Single table inheritance would be an option
+  OPTIONS = {
+    "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},
+    "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},
+    "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}
+  }.freeze
+  
+  def self.get_values(option)
+    find(:all, :conditions => {:opt => option}, :order => 'position')
   end
   
+  def self.default(option)  
+    find(:first, :conditions => {:opt => option, :is_default => true}, :order => 'position')
+  end
+
+  def option_name
+    OPTIONS[self.opt][:label]
+  end
+
+  def before_save
+    Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
+  end
+  
+  def objects_count
+    OPTIONS[self.opt][:model].count(:conditions => "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+  end
+  
+  def in_use?
+    self.objects_count != 0
+  end
+  
+  alias :destroy_without_reassign :destroy
+  
+  # Destroy the enumeration
+  # If a enumeration is specified, objects are reassigned
+  def destroy(reassign_to = nil)
+    if reassign_to && reassign_to.is_a?(Enumeration)
+      OPTIONS[self.opt][:model].update_all("#{OPTIONS[self.opt][:foreign_key]} = #{reassign_to.id}", "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+    end
+    destroy_without_reassign
+  end
+  
+  def <=>(enumeration)
+    position <=> enumeration.position
+  end
+  
+  def to_s; name end
+  
 private
   def check_integrity
-    case self.opt
-    when "IPRI"
-      raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
-    when "DCAT"
-      raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
-    when "ACTI"
-      raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
-    end
+    raise "Can't delete enumeration" if self.in_use?
   end
 end

app/models/issue.rb

@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2007  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
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Issue < ActiveRecord::Base
-
   belongs_to :project
   belongs_to :tracker
   belongs_to :status, :class_name => 'IssueStatus', :foreign_key => 'status_id'
@@ -28,19 +27,88 @@ class Issue < ActiveRecord::Base
 
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
-  has_many :time_entries
-  has_many :custom_values, :dependent => :delete_all, :as => :customized
-  has_many :custom_fields, :through => :custom_values
-
-  validates_presence_of :subject, :description, :priority, :tracker, :author, :status
+  has_many :time_entries, :dependent => :delete_all
+  has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id ASC"
+  
+  has_many :relations_from, :class_name => 'IssueRelation', :foreign_key => 'issue_from_id', :dependent => :delete_all
+  has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
+  
+  acts_as_customizable
+  acts_as_watchable
+  acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
+                     :include => [:project, :journals],
+                     # sort by id so that limited eager loading doesn't break with postgresql
+                     :order_column => "#{table_name}.id"
+  acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
+                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
+  
+  acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
+                            :author_key => :author_id
+  
+  validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
+  validates_length_of :subject, :maximum => 255
   validates_inclusion_of :done_ratio, :in => 0..100
-  validates_associated :custom_values, :on => :update
+  validates_numericality_of :estimated_hours, :allow_nil => true
 
-  # set default status for new issues
-  def before_validation
-    self.status = IssueStatus.default if status.nil?
+  def after_initialize
+    if new_record?
+      # set default values for new records only
+      self.status ||= IssueStatus.default
+      self.priority ||= Enumeration.default('IPRI')
+    end
   end
-
+  
+  # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
+  def available_custom_fields
+    (project && tracker) ? project.all_issue_custom_fields.select {|c| tracker.custom_fields.include? c } : []
+  end
+  
+  def copy_from(arg)
+    issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
+    self.attributes = issue.attributes.dup
+    self.custom_values = issue.custom_values.collect {|v| v.clone}
+    self
+  end
+  
+  # Move an issue to a new project and tracker
+  def move_to(new_project, new_tracker = nil)
+    transaction do
+      if new_project && project_id != new_project.id
+        # delete issue relations
+        unless Setting.cross_project_issue_relations?
+          self.relations_from.clear
+          self.relations_to.clear
+        end
+        # issue is moved to another project
+        # reassign to the category with same name if any
+        new_category = category.nil? ? nil : new_project.issue_categories.find_by_name(category.name)
+        self.category = new_category
+        self.fixed_version = nil
+        self.project = new_project
+      end
+      if new_tracker
+        self.tracker = new_tracker
+      end
+      if save
+        # Manually update project_id on related time entries
+        TimeEntry.update_all("project_id = #{new_project.id}", {:issue_id => id})
+      else
+        rollback_db_transaction
+        return false
+      end
+    end
+    return true
+  end
+  
+  def priority_id=(pid)
+    self.priority = nil
+    write_attribute(:priority_id, pid)
+  end
+  
+  def estimated_hours=(h)
+    write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
+  end
+  
   def validate
     if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
       errors.add :due_date, :activerecord_error_not_a_date
@@ -49,13 +117,24 @@ class Issue < ActiveRecord::Base
     if self.due_date and self.start_date and self.due_date < self.start_date
       errors.add :due_date, :activerecord_error_greater_than_start_date
     end
+    
+    if start_date && soonest_start && start_date < soonest_start
+      errors.add :start_date, :activerecord_error_invalid
+    end
   end
-
-  #def before_create
-  #  build_history
-  #end
   
-  def before_save
+  def validate_on_create
+    errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
+  end
+  
+  def before_create
+    # default assignment based on category
+    if assigned_to.nil? && category && category.assigned_to
+      self.assigned_to = category.assigned_to
+    end
+  end
+  
+  def before_save  
     if @current_journal
       # attributes changes
       (Issue.column_names - %w(id description)).each {|c|
@@ -66,41 +145,120 @@ class Issue < ActiveRecord::Base
       }
       # custom fields changes
       custom_values.each {|c|
+        next if (@custom_values_before_change[c.custom_field_id]==c.value ||
+                  (@custom_values_before_change[c.custom_field_id].blank? && c.value.blank?))
         @current_journal.details << JournalDetail.new(:property => 'cf', 
                                                       :prop_key => c.custom_field_id,
                                                       :old_value => @custom_values_before_change[c.custom_field_id],
-                                                      :value => c.value) unless @custom_values_before_change[c.custom_field_id]==c.value
+                                                      :value => c.value)
       }      
-      @current_journal.save unless @current_journal.details.empty? and @current_journal.notes.empty?
+      @current_journal.save
     end
+    # Save the issue even if the journal is not saved (because empty)
+    true
   end
   
-  def long_id
-    "%05d" % self.id
-  end
-  
-  def custom_value_for(custom_field)
-    self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
-    return nil
+  def after_save
+    # Reload is needed in order to get the right status
+    reload
+    
+    # Update start/due dates of following issues
+    relations_from.each(&:set_issue_to_dates)
+    
+    # Close duplicates if the issue was closed
+    if @issue_before_change && !@issue_before_change.closed? && self.closed?
+      duplicates.each do |duplicate|
+        # Reload is need in case the duplicate was updated by a previous duplicate
+        duplicate.reload
+        # Don't re-close it if it's already closed
+        next if duplicate.closed?
+        # Same user and notes
+        duplicate.init_journal(@current_journal.user, @current_journal.notes)
+        duplicate.update_attribute :status, self.status
+      end
+    end
   end
   
   def init_journal(user, notes = "")
     @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
     @issue_before_change = self.clone
+    @issue_before_change.status = self.status
     @custom_values_before_change = {}
     self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
+    # Make sure updated_on is updated when adding a note.
+    updated_on_will_change!
     @current_journal
   end
   
+  # Return true if the issue is closed, otherwise false
+  def closed?
+    self.status.is_closed?
+  end
+  
+  # Users the issue can be assigned to
+  def assignable_users
+    project.assignable_users
+  end
+  
+  # Returns an array of status that user is able to apply
+  def new_statuses_allowed_to(user)
+    statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
+    statuses << status unless statuses.empty?
+    statuses.uniq.sort
+  end
+  
+  # Returns the mail adresses of users that should be notified for the issue
+  def recipients
+    recipients = project.recipients
+    # Author and assignee are always notified unless they have been locked
+    recipients << author.mail if author && author.active?
+    recipients << assigned_to.mail if assigned_to && assigned_to.active?
+    recipients.compact.uniq
+  end
+  
   def spent_hours
     @spent_hours ||= time_entries.sum(:hours) || 0
   end
-
-private
-  # Creates an history for the issue
-  #def build_history
-  #  @history = self.histories.build
-  #  @history.status = self.status
-  #  @history.author = self.author
-  #end
+  
+  def relations
+    (relations_from + relations_to).sort
+  end
+  
+  def all_dependent_issues
+    dependencies = []
+    relations_from.each do |relation|
+      dependencies << relation.issue_to
+      dependencies += relation.issue_to.all_dependent_issues
+    end
+    dependencies
+  end
+  
+  # Returns an array of issues that duplicate this one
+  def duplicates
+    relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
+  end
+  
+  # Returns the due date or the target due date if any
+  # Used on gantt chart
+  def due_before
+    due_date || (fixed_version ? fixed_version.effective_date : nil)
+  end
+  
+  def duration
+    (start_date && due_date) ? due_date - start_date : 0
+  end
+  
+  def soonest_start
+    @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
+  end
+  
+  def self.visible_by(usr)
+    with_scope(:find => { :conditions => Project.visible_by(usr) }) do
+      yield
+    end
+  end
+  
+  def to_s
+    "#{tracker} ##{id}: #{subject}"
+  end
 end

app/models/issue_category.rb

@@ -16,14 +16,28 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategory < ActiveRecord::Base
-  before_destroy :check_integrity  
   belongs_to :project
-
+  belongs_to :assigned_to, :class_name => 'User', :foreign_key => 'assigned_to_id'
+  has_many :issues, :foreign_key => 'category_id', :dependent => :nullify
+  
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
+  validates_length_of :name, :maximum => 30
   
-private
-  def check_integrity
-    raise "Can't delete category" if Issue.find(:first, :conditions => ["category_id=?", self.id])
+  alias :destroy_without_reassign :destroy
+  
+  # Destroy the category
+  # If a category is specified, issues are reassigned to this category
+  def destroy(reassign_to = nil)
+    if reassign_to && reassign_to.is_a?(IssueCategory) && reassign_to.project == self.project
+      Issue.update_all("category_id = #{reassign_to.id}", "category_id = #{id}")
+    end
+    destroy_without_reassign
   end
+  
+  def <=>(category)
+    name <=> category.name
+  end
+  
+  def to_s; name end
 end

app/models/issue_relation.rb

@@ -0,0 +1,79 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class IssueRelation < ActiveRecord::Base
+  belongs_to :issue_from, :class_name => 'Issue', :foreign_key => 'issue_from_id'
+  belongs_to :issue_to, :class_name => 'Issue', :foreign_key => 'issue_to_id'
+  
+  TYPE_RELATES      = "relates"
+  TYPE_DUPLICATES   = "duplicates"
+  TYPE_BLOCKS       = "blocks"
+  TYPE_PRECEDES     = "precedes"
+  
+  TYPES = { TYPE_RELATES =>     { :name => :label_relates_to, :sym_name => :label_relates_to, :order => 1 },
+            TYPE_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by, :order => 2 },
+            TYPE_BLOCKS =>      { :name => :label_blocks, :sym_name => :label_blocked_by, :order => 3 },
+            TYPE_PRECEDES =>    { :name => :label_precedes, :sym_name => :label_follows, :order => 4 },
+          }.freeze
+  
+  validates_presence_of :issue_from, :issue_to, :relation_type
+  validates_inclusion_of :relation_type, :in => TYPES.keys
+  validates_numericality_of :delay, :allow_nil => true
+  validates_uniqueness_of :issue_to_id, :scope => :issue_from_id
+  
+  def validate
+    if issue_from && issue_to
+      errors.add :issue_to_id, :activerecord_error_invalid if issue_from_id == issue_to_id
+      errors.add :issue_to_id, :activerecord_error_not_same_project unless issue_from.project_id == issue_to.project_id || Setting.cross_project_issue_relations?
+      errors.add_to_base :activerecord_error_circular_dependency if issue_to.all_dependent_issues.include? issue_from
+    end
+  end
+  
+  def other_issue(issue)
+    (self.issue_from_id == issue.id) ? issue_to : issue_from
+  end
+  
+  def label_for(issue)
+    TYPES[relation_type] ? TYPES[relation_type][(self.issue_from_id == issue.id) ? :name : :sym_name] : :unknow
+  end
+  
+  def before_save
+    if TYPE_PRECEDES == relation_type
+      self.delay ||= 0
+    else
+      self.delay = nil
+    end
+    set_issue_to_dates
+  end
+  
+  def set_issue_to_dates
+    soonest_start = self.successor_soonest_start
+    if soonest_start && (!issue_to.start_date || issue_to.start_date < soonest_start)
+      issue_to.start_date, issue_to.due_date = successor_soonest_start, successor_soonest_start + issue_to.duration
+      issue_to.save
+    end
+  end
+  
+  def successor_soonest_start
+    return nil unless (TYPE_PRECEDES == self.relation_type) && (issue_from.start_date || issue_from.due_date)
+    (issue_from.due_date || issue_from.start_date) + 1 + delay
+  end
+  
+  def <=>(relation)
+    TYPES[self.relation_type][:order] <=> TYPES[relation.relation_type][:order]
+  end
+end

app/models/issue_status.rb

@@ -17,17 +17,16 @@
 
 class IssueStatus < ActiveRecord::Base
   before_destroy :check_integrity  
-  has_many :workflows, :foreign_key => "old_status_id"
+  has_many :workflows, :foreign_key => "old_status_id", :dependent => :delete_all
   acts_as_list
 
   validates_presence_of :name
   validates_uniqueness_of :name
+  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :html_color, :is => 6
-  validates_format_of :html_color, :with => /^[a-f0-9]*$/i
 
-  def before_save
-    IssueStatus.update_all "is_default=#{connection.quoted_false}" if self.is_default?
+  def after_save
+    IssueStatus.update_all("is_default=#{connection.quoted_false}", ['id <> ?', id]) if self.is_default?
   end  
   
   # Returns the default status for new issues
@@ -38,21 +37,31 @@ class IssueStatus < ActiveRecord::Base
   # Returns an array of all statuses the given role can switch to
   # Uses association cache when called more than one time
   def new_statuses_allowed_to(role, tracker)
-    new_statuses = [self]
-    new_statuses += workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
-    new_statuses.sort{|x, y| x.position <=> y.position }
+    new_statuses = workflows.select {|w| w.role_id == role.id && w.tracker_id == tracker.id}.collect{|w| w.new_status} if role && tracker
+    new_statuses ? new_statuses.compact.sort{|x, y| x.position <=> y.position } : []
   end
   
   # Same thing as above but uses a database query
   # More efficient than the previous method if called just once
   def find_new_statuses_allowed_to(role, tracker)  
-    new_statuses = [self]
-    new_statuses += workflows.find(:all, 
+    new_statuses = workflows.find(:all, 
                                    :include => :new_status,
-                                   :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }  if role && tracker
-    new_statuses.sort{|x, y| x.position <=> y.position }
+                                   :conditions => ["role_id=? and tracker_id=?", role.id, tracker.id]).collect{ |w| w.new_status }.compact  if role && tracker
+    new_statuses ? new_statuses.sort{|x, y| x.position <=> y.position } : []
   end
   
+  def new_status_allowed_to?(status, role, tracker)
+    status && role && tracker ?
+      !workflows.find(:first, :conditions => {:new_status_id => status.id, :role_id => role.id, :tracker_id => tracker.id}).nil? :
+      false
+  end
+
+  def <=>(status)
+    position <=> status.position
+  end
+  
+  def to_s; name end
+
 private
   def check_integrity
     raise "Can't delete status" if Issue.find(:first, :conditions => ["status_id=?", self.id])

app/models/journal.rb

@@ -23,4 +23,46 @@ class Journal < ActiveRecord::Base
   
   belongs_to :user
   has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
+  attr_accessor :indice
+  
+  acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
+                :description => :notes,
+                :author => :user,
+                :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
+                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
+
+  acts_as_activity_provider :type => 'issues',
+                            :permission => :view_issues,
+                            :author_key => :user_id,
+                            :find_options => {:include => [{:issue => :project}, :details, :user],
+                                              :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
+                                                             " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
+  
+  def save
+    # Do not save an empty journal
+    (details.empty? && notes.blank?) ? false : super
+  end
+  
+  # Returns the new status if the journal contains a status change, otherwise nil
+  def new_status
+    c = details.detect {|detail| detail.prop_key == 'status_id'}
+    (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
+  end
+  
+  def new_value_for(prop)
+    c = details.detect {|detail| detail.prop_key == prop}
+    c ? c.value : nil
+  end
+  
+  def editable_by?(usr)
+    usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
+  end
+  
+  def project
+    journalized.respond_to?(:project) ? journalized.project : nil
+  end
+  
+  def attachments
+    journalized.respond_to?(:attachments) ? journalized.attachments : nil
+  end
 end

app/models/journal_detail.rb

@@ -17,4 +17,9 @@
 
 class JournalDetail < ActiveRecord::Base
   belongs_to :journal
+  
+  def before_save
+    self.value = value[0..254] if value && value.is_a?(String)
+    self.old_value = old_value[0..254] if old_value && old_value.is_a?(String)
+  end
 end

app/models/mail_handler.rb

@@ -0,0 +1,176 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class MailHandler < ActionMailer::Base
+
+  class UnauthorizedAction < StandardError; end
+  class MissingInformation < StandardError; end
+  
+  attr_reader :email, :user
+
+  def self.receive(email, options={})
+    @@handler_options = options.dup
+    
+    @@handler_options[:issue] ||= {}
+    
+    @@handler_options[:allow_override] = @@handler_options[:allow_override].split(',').collect(&:strip) if @@handler_options[:allow_override].is_a?(String)
+    @@handler_options[:allow_override] ||= []
+    # Project needs to be overridable if not specified
+    @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
+    # Status overridable by default
+    @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)    
+    super email
+  end
+  
+  # Processes incoming emails
+  def receive(email)
+    @email = email
+    @user = User.active.find(:first, :conditions => ["LOWER(mail) = ?", email.from.first.to_s.strip.downcase])
+    unless @user
+      # Unknown user => the email is ignored
+      # TODO: ability to create the user's account
+      logger.info "MailHandler: email submitted by unknown user [#{email.from.first}]" if logger && logger.info
+      return false
+    end
+    User.current = @user
+    dispatch
+  end
+  
+  private
+
+  ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]+#(\d+)\]}
+  
+  def dispatch
+    if m = email.subject.match(ISSUE_REPLY_SUBJECT_RE)
+      receive_issue_update(m[1].to_i)
+    else
+      receive_issue
+    end
+  rescue ActiveRecord::RecordInvalid => e
+    # TODO: send a email to the user
+    logger.error e.message if logger
+    false
+  rescue MissingInformation => e
+    logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
+    false
+  rescue UnauthorizedAction => e
+    logger.error "MailHandler: unauthorized attempt from #{user}" if logger
+    false
+  end
+  
+  # Creates a new issue
+  def receive_issue
+    project = target_project
+    tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)
+    category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
+    priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
+
+    # check permission
+    raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
+    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
+    # check workflow
+    if status && issue.new_statuses_allowed_to(user).include?(status)
+      issue.status = status
+    end
+    issue.subject = email.subject.chomp.toutf8
+    issue.description = email.plain_text_body.chomp
+    issue.save!
+    add_attachments(issue)
+    logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
+    # send notification before adding watchers since they were cc'ed
+    Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
+    # add To and Cc as watchers
+    add_watchers(issue)
+    
+    issue
+  end
+  
+  def target_project
+    # TODO: other ways to specify project:
+    # * parse the email To field
+    # * specific project (eg. Setting.mail_handler_target_project)
+    target = Project.find_by_identifier(get_keyword(:project))
+    raise MissingInformation.new('Unable to determine target project') if target.nil?
+    target
+  end
+  
+  # Adds a note to an existing issue
+  def receive_issue_update(issue_id)
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
+    
+    issue = Issue.find_by_id(issue_id)
+    return unless issue
+    # check permission
+    raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
+    raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
+
+    # add the note
+    journal = issue.init_journal(user, email.plain_text_body.chomp)
+    add_attachments(issue)
+    # check workflow
+    if status && issue.new_statuses_allowed_to(user).include?(status)
+      issue.status = status
+    end
+    issue.save!
+    logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
+    Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+    journal
+  end
+  
+  def add_attachments(obj)
+    if email.has_attachments?
+      email.attachments.each do |attachment|
+        Attachment.create(:container => obj,
+                          :file => attachment,
+                          :author => user,
+                          :content_type => attachment.content_type)
+      end
+    end
+  end
+  
+  # Adds To and Cc as watchers of the given object if the sender has the
+  # appropriate permission
+  def add_watchers(obj)
+    if user.allowed_to?("add_#{obj.class.name.underscore}_watchers".to_sym, obj.project)
+      addresses = [email.to, email.cc].flatten.compact.uniq.collect {|a| a.strip.downcase}
+      unless addresses.empty?
+        watchers = User.active.find(:all, :conditions => ['LOWER(mail) IN (?)', addresses])
+        watchers.each {|w| obj.add_watcher(w)}
+      end
+    end
+  end
+  
+  def get_keyword(attr)
+    if @@handler_options[:allow_override].include?(attr.to_s) && email.plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
+      $1.strip
+    elsif !@@handler_options[:issue][attr].blank?
+      @@handler_options[:issue][attr]
+    end
+  end
+end
+
+class TMail::Mail
+  # Returns body of the first plain text part found if any
+  def plain_text_body
+    return @plain_text_body unless @plain_text_body.nil?
+    p = self.parts.collect {|c| (c.respond_to?(:parts) && !c.parts.empty?) ? c.parts : c}.flatten
+    plain = p.detect {|c| c.content_type == 'text/plain'}
+    @plain_text_body = plain.nil? ? self.body : plain.body
+  end
+end
+

app/models/mailer.rb

@@ -5,84 +5,243 @@
 # 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.
 
 class Mailer < ActionMailer::Base
-  helper IssuesHelper
+  helper :application
+  helper :issues
+  helper :custom_fields
+
+  include ActionController::UrlWriter
 
   def issue_add(issue)
-    set_language_if_valid(Setting.default_language)
-    # Sends to all project members
-    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-    @from           = Setting.mail_from
-    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
-    @body['issue']  = issue
+    redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Id' => issue.id,
+                    'Issue-Author' => issue.author.login
+    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
+    recipients issue.recipients
+    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
+    body :issue => issue,
+         :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
   end
 
   def issue_edit(journal)
-    set_language_if_valid(Setting.default_language)
-    # Sends to all project members
     issue = journal.journalized
-    @recipients     = issue.project.members.collect { |m| m.user.mail if m.user.mail_notification }.compact
-    @from           = Setting.mail_from
-    @subject        = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
-    @body['issue']  = issue
-    @body['journal']= journal
+    redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Id' => issue.id,
+                    'Issue-Author' => issue.author.login
+    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
+    recipients issue.recipients
+    # Watchers in cc
+    cc(issue.watcher_recipients - @recipients)
+    s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
+    s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
+    s << issue.subject
+    subject s
+    body :issue => issue,
+         :journal => journal,
+         :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
   end
-  
-  def document_add(document)
-    set_language_if_valid(Setting.default_language)
-    @recipients     = document.project.users.collect { |u| u.mail if u.mail_notification }.compact
-    @from           = Setting.mail_from
-    @subject        = "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
-    @body['document'] = document
+
+  def reminder(user, issues, days)
+    set_language_if_valid user.language
+    recipients user.mail
+    subject l(:mail_subject_reminder, issues.size)
+    body :issues => issues,
+         :days => days,
+         :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'issues.due_date', :sort_order => 'asc')
   end
-  
-  def attachments_add(attachments)
-    set_language_if_valid(Setting.default_language)
+
+  def document_added(document)
+    redmine_headers 'Project' => document.project.identifier
+    recipients document.project.recipients
+    subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
+    body :document => document,
+         :document_url => url_for(:controller => 'documents', :action => 'show', :id => document)
+  end
+
+  def attachments_added(attachments)
     container = attachments.first.container
-    url = "http://#{Setting.host_name}/"
-    added_to = ""
-    case container.class.to_s
+    added_to = ''
+    added_to_url = ''
+    case container.class.name
     when 'Version'
-      url << "projects/list_files/#{container.project_id}"
+      added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
       added_to = "#{l(:label_version)}: #{container.name}"
     when 'Document'
-      url << "documents/show/#{container.id}"
+      added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
       added_to = "#{l(:label_document)}: #{container.title}"
-    when 'Issue'
-      url << "issues/show/#{container.id}"
-      added_to = "#{container.tracker.name} ##{container.id}: #{container.subject}"
     end
-    @recipients     = container.project.users.collect { |u| u.mail if u.mail_notification }.compact
-    @from           = Setting.mail_from
-    @subject        = "[#{container.project.name}] #{l(:label_attachment_new)}"
-    @body['attachments'] = attachments
-    @body['url']    = url
-    @body['added_to'] = added_to
+    redmine_headers 'Project' => container.project.identifier
+    recipients container.project.recipients
+    subject "[#{container.project.name}] #{l(:label_attachment_new)}"
+    body :attachments => attachments,
+         :added_to => added_to,
+         :added_to_url => added_to_url
   end
-  
+
+  def news_added(news)
+    redmine_headers 'Project' => news.project.identifier
+    recipients news.project.recipients
+    subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    body :news => news,
+         :news_url => url_for(:controller => 'news', :action => 'show', :id => news)
+  end
+
+  def message_posted(message, recipients)
+    redmine_headers 'Project' => message.project.identifier,
+                    'Topic-Id' => (message.parent_id || message.id)
+    recipients(recipients)
+    subject "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
+    body :message => message,
+         :message_url => url_for(:controller => 'messages', :action => 'show', :board_id => message.board_id, :id => message.root)
+  end
+
+  def account_information(user, password)
+    set_language_if_valid user.language
+    recipients user.mail
+    subject l(:mail_subject_register, Setting.app_title)
+    body :user => user,
+         :password => password,
+         :login_url => url_for(:controller => 'account', :action => 'login')
+  end
+
+  def account_activation_request(user)
+    # Send the email to all active administrators
+    recipients User.active.find(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
+    subject l(:mail_subject_account_activation_request, Setting.app_title)
+    body :user => user,
+         :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
+  end
+
   def lost_password(token)
     set_language_if_valid(token.user.language)
-    @recipients     = token.user.mail
-    @from           = Setting.mail_from
-    @subject        = l(:mail_subject_lost_password)
-    @body['token']  = token
-  end  
+    recipients token.user.mail
+    subject l(:mail_subject_lost_password, Setting.app_title)
+    body :token => token,
+         :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
+  end
 
   def register(token)
     set_language_if_valid(token.user.language)
-    @recipients     = token.user.mail
-    @from           = Setting.mail_from
-    @subject        = l(:mail_subject_register)
-    @body['token']  = token
+    recipients token.user.mail
+    subject l(:mail_subject_register, Setting.app_title)
+    body :token => token,
+         :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
   end
+
+  def test(user)
+    set_language_if_valid(user.language)
+    recipients user.mail
+    subject 'Redmine test'
+    body :url => url_for(:controller => 'welcome')
+  end
+
+  # Overrides default deliver! method to prevent from sending an email
+  # with no recipient, cc or bcc
+  def deliver!(mail = @mail)
+    return false if (recipients.nil? || recipients.empty?) &&
+                    (cc.nil? || cc.empty?) &&
+                    (bcc.nil? || bcc.empty?)
+    super
+  end
+
+  # Sends reminders to issue assignees
+  # Available options:
+  # * :days     => how many days in the future to remind about (defaults to 7)
+  # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
+  # * :project  => id or identifier of project to process (defaults to all projects)
+  def self.reminders(options={})
+    days = options[:days] || 7
+    project = options[:project] ? Project.find(options[:project]) : nil
+    tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
+
+    s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
+    s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
+    s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
+    s << "#{Issue.table_name}.project_id = #{project.id}" if project
+    s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker
+
+    issues_by_assignee = Issue.find(:all, :include => [:status, :assigned_to, :project, :tracker],
+                                          :conditions => s.conditions
+                                    ).group_by(&:assigned_to)
+    issues_by_assignee.each do |assignee, issues|
+      deliver_reminder(assignee, issues, days) unless assignee.nil?
+    end
+  end
+
+  private
+  def initialize_defaults(method_name)
+    super
+    set_language_if_valid Setting.default_language
+    from Setting.mail_from
+    
+    # URL options
+    h = Setting.host_name
+    h = h.to_s.gsub(%r{\/.*$}, '') unless ActionController::AbstractRequest.relative_url_root.blank?
+    default_url_options[:host] = h
+    default_url_options[:protocol] = Setting.protocol
+    
+    # Common headers
+    headers 'X-Mailer' => 'Redmine',
+            'X-Redmine-Host' => Setting.host_name,
+            'X-Redmine-Site' => Setting.app_title
+  end
+
+  # Appends a Redmine header field (name is prepended with 'X-Redmine-')
+  def redmine_headers(h)
+    h.each { |k,v| headers["X-Redmine-#{k}"] = v }
+  end
+
+  # Overrides the create_mail method
+  def create_mail
+    # Removes the current user from the recipients and cc
+    # if he doesn't want to receive notifications about what he does
+    if User.current.pref[:no_self_notified]
+      recipients.delete(User.current.mail) if recipients
+      cc.delete(User.current.mail) if cc
+    end
+    # Blind carbon copy recipients
+    if Setting.bcc_recipients?
+      bcc([recipients, cc].flatten.compact.uniq)
+      recipients []
+      cc []
+    end
+    super
+  end
+
+  # Renders a message with the corresponding layout
+  def render_message(method_name, body)
+    layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
+    body[:content_for_layout] = render(:file => method_name, :body => body)
+    ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}", :use_full_path => true)
+  end
+
+  # for the case of plain text only
+  def body(*params)
+    value = super(*params)
+    if Setting.plain_text_mail?
+      templates = Dir.glob("#{template_path}/#{@template}.text.plain.{rhtml,erb}")
+      unless String === @body or templates.empty?
+        template = File.basename(templates.first)
+        @body[:content_for_layout] = render(:file => template, :body => @body)
+        @body = ActionView::Base.new(template_root, @body, self).render(:file => "mailer/layout.text.plain.rhtml", :use_full_path => true)
+        return @body
+      end
+    end
+    return value
+  end
+
+  # Makes partial rendering work with Rails 1.2 (retro-compatibility)
+  def self.controller_path
+    ''
+  end unless respond_to?('controller_path')
 end

app/models/member.rb

@@ -23,7 +23,20 @@ class Member < ActiveRecord::Base
   validates_presence_of :role, :user, :project
   validates_uniqueness_of :user_id, :scope => :project_id
 
+  def validate
+    errors.add :role_id, :activerecord_error_invalid if role && !role.member?
+  end
+  
   def name
-    self.user.display_name
+    self.user.name
+  end
+  
+  def <=>(member)
+    role == member.role ? (user <=> member.user) : (role <=> member.role)
+  end
+  
+  def before_destroy
+    # remove category based auto assignments for this member
+    IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
   end
 end

app/models/message.rb

@@ -0,0 +1,89 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class Message < ActiveRecord::Base
+  belongs_to :board
+  belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
+  acts_as_tree :counter_cache => :replies_count, :order => "#{Message.table_name}.created_on ASC"
+  has_many :attachments, :as => :container, :dependent => :destroy
+  belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
+  
+  acts_as_searchable :columns => ['subject', 'content'],
+                     :include => {:board, :project},
+                     :project_key => 'project_id',
+                     :date_column => "#{table_name}.created_on"
+  acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
+                :description => :content,
+                :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
+                :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} : 
+                                                                                                                                       {:id => o.parent_id, :anchor => "message-#{o.id}"})}
+
+  acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]},
+                            :author_key => :author_id
+  acts_as_watchable
+    
+  attr_protected :locked, :sticky
+  validates_presence_of :subject, :content
+  validates_length_of :subject, :maximum => 255
+  
+  after_create :add_author_as_watcher
+  
+  def validate_on_create
+    # Can not reply to a locked topic
+    errors.add_to_base 'Topic is locked' if root.locked? && self != root
+  end
+  
+  def after_create
+    board.update_attribute(:last_message_id, self.id)
+    board.increment! :messages_count
+    if parent
+      parent.reload.update_attribute(:last_reply_id, self.id)
+    else
+      board.increment! :topics_count
+    end
+  end
+  
+  def after_destroy
+    # The following line is required so that the previous counter
+    # updates (due to children removal) are not overwritten
+    board.reload
+    board.decrement! :messages_count
+    board.decrement! :topics_count unless parent
+  end
+  
+  def sticky?
+    sticky == 1
+  end
+  
+  def project
+    board.project
+  end
+
+  def editable_by?(usr)
+    usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
+  end
+
+  def destroyable_by?(usr)
+    usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
+  end
+  
+  private
+  
+  def add_author_as_watcher
+    Watcher.create(:watchable => self.root, :user => author)
+  end
+end

app/models/message_observer.rb

@@ -0,0 +1,30 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+class MessageObserver < ActiveRecord::Observer
+  def after_create(message)
+    recipients = []
+    # send notification to the topic watchers
+    recipients += message.root.watcher_recipients
+    # send notification to the board watchers
+    recipients += message.board.watcher_recipients
+    # send notification to project members who want to be notified
+    recipients += message.board.project.recipients
+    recipients = recipients.compact.uniq
+    Mailer.deliver_message_posted(message, recipients) if !recipients.empty? && Setting.notified_events.include?('message_posted')
+  end
+end

app/models/news.rb

@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -21,9 +21,16 @@ class News < ActiveRecord::Base
   has_many :comments, :as => :commented, :dependent => :delete_all, :order => "created_on"
   
   validates_presence_of :title, :description
+  validates_length_of :title, :maximum => 60
+  validates_length_of :summary, :maximum => 255
+
+  acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
+  acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
+  acts_as_activity_provider :find_options => {:include => [:project, :author]},
+                            :author_key => :author_id
   
   # returns latest news for projects visible by user
-  def self.latest(user=nil, count=5)
-    find(:all, :limit => count, :conditions => Project.visible_by(user), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")	
+  def self.latest(user = User.current, count = 5)
+    find(:all, :limit => count, :conditions => Project.allowed_to_condition(user, :view_news), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")	
   end
 end

app/models/permission.rb

@@ -1,66 +0,0 @@
-# redMine - project management software
-# Copyright (C) 2006  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.
-
-class Permission < ActiveRecord::Base
-  has_and_belongs_to_many :roles
-
-  validates_presence_of :controller, :action, :description
-
-  GROUPS = {
-    100 => :label_project,
-    200 => :label_member_plural,
-    300 => :label_version_plural,
-    400 => :label_issue_category_plural,
-    600 => :label_query_plural,
-    1000 => :label_issue_plural,
-    1100 => :label_news_plural,
-    1200 => :label_document_plural,
-    1300 => :label_attachment_plural,
-    1400 => :label_repository,
-    1500 => :label_time_tracking
-  }.freeze
-  
-  @@cached_perms_for_public = nil
-  @@cached_perms_for_roles = nil
-  
-  def name
-    self.controller + "/" + self.action
-  end
-  
-  def group_id
-    (self.sort / 100)*100
-  end
-  
-  def self.allowed_to_public(action)
-    @@cached_perms_for_public ||= find(:all, :conditions => ["is_public=?", true]).collect {|p| "#{p.controller}/#{p.action}"}
-    @@cached_perms_for_public.include? action
-  end
-  
-  def self.allowed_to_role(action, role)
-    @@cached_perms_for_roles ||=
-      begin
-        perms = {}
-        find(:all, :include => :roles).each {|p| perms.store "#{p.controller}/#{p.action}", p.roles.collect {|r| r.id } }
-        perms
-      end
-    allowed_to_public(action) or (role && @@cached_perms_for_roles[action] && @@cached_perms_for_roles[action].include?(role.id))
-  end
-  
-  def self.allowed_to_role_expired
-    @@cached_perms_for_roles = nil
-  end
-end

app/models/project.rb

@@ -16,31 +16,55 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Project < ActiveRecord::Base
-  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
-  has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
+  # Project statuses
+  STATUS_ACTIVE     = 1
+  STATUS_ARCHIVED   = 9
+  
+  has_many :members, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
   has_many :users, :through => :members
-  has_many :custom_values, :dependent => :delete_all, :as => :customized
+  has_many :enabled_modules, :dependent => :delete_all
+  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
   has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
+  has_many :issue_changes, :through => :issues, :source => :journals
+  has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
   has_many :time_entries, :dependent => :delete_all
   has_many :queries, :dependent => :delete_all
   has_many :documents, :dependent => :destroy
   has_many :news, :dependent => :delete_all, :include => :author
   has_many :issue_categories, :dependent => :delete_all, :order => "#{IssueCategory.table_name}.name"
+  has_many :boards, :dependent => :destroy, :order => "position ASC"
   has_one :repository, :dependent => :destroy
+  has_many :changesets, :through => :repository
   has_one :wiki, :dependent => :destroy
-  has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
+  # Custom field for the project issues
+  has_and_belongs_to_many :issue_custom_fields, 
+                          :class_name => 'IssueCustomField',
+                          :order => "#{CustomField.table_name}.position",
+                          :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
+                          :association_foreign_key => 'custom_field_id'
+                          
   acts_as_tree :order => "name", :counter_cache => true
+
+  acts_as_customizable
+  acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
+  acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
+                :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}},
+                :author => nil
+
+  attr_protected :status, :enabled_module_names
   
-  validates_presence_of :name, :description, :identifier
+  validates_presence_of :name, :identifier
   validates_uniqueness_of :name, :identifier
-  validates_associated :custom_values, :on => :update
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
-  validates_length_of :description, :maximum => 255
-  validates_length_of :identifier, :in => 3..12
+  validates_length_of :homepage, :maximum => 255
+  validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
+  before_destroy :delete_all_members
+
+  named_scope :has_module, lambda { |mod| { :conditions => ["#{Project.table_name}.id IN (SELECT em.project_id FROM #{EnabledModule.table_name} em WHERE em.name=?)", mod.to_s] } }
+  
   def identifier=(identifier)
     super unless identifier_frozen?
   end
@@ -51,17 +75,19 @@ class Project < ActiveRecord::Base
   
   def issues_with_subprojects(include_subprojects=false)
     conditions = nil
-    if include_subprojects && children.size > 0
-      ids = [id] + children.collect {|c| c.id}
-      conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
-    else
-      conditions = ["#{Issue.table_name}.project_id = ?", id]
+    if include_subprojects
+      ids = [id] + child_ids
+      conditions = ["#{Project.table_name}.id IN (#{ids.join(',')}) AND #{Project.visible_by}"]
     end
-    Issue.with_scope :find => { :conditions => conditions } do 
-      yield
+    conditions ||= ["#{Project.table_name}.id = ?", id]
+    # Quick and dirty fix for Rails 2 compatibility
+    Issue.send(:with_scope, :find => { :conditions => conditions }) do 
+      Version.send(:with_scope, :find => { :conditions => conditions }) do
+        yield
+      end
     end 
   end
-  
+
   # returns latest created projects
   # non public projects will be returned only if user is a member of those
   def self.latest(user=nil, count=5)
@@ -69,26 +95,180 @@ class Project < ActiveRecord::Base
   end	
 
   def self.visible_by(user=nil)
-    if user && !user.memberships.empty?
-      return ["#{Project.table_name}.is_public = ? or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')})", true]
+    user ||= User.current
+    if user && user.admin?
+      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+    elsif user && user.memberships.any?
+      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND (#{Project.table_name}.is_public = #{connection.quoted_true} or #{Project.table_name}.id IN (#{user.memberships.collect{|m| m.project_id}.join(',')}))"
     else
-      return ["#{Project.table_name}.is_public = ?", true]
+      return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE} AND #{Project.table_name}.is_public = #{connection.quoted_true}"
     end
   end
   
+  def self.allowed_to_condition(user, permission, options={})
+    statements = []
+    base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+    if perm = Redmine::AccessControl.permission(permission)
+      unless perm.project_module.nil?
+        # If the permission belongs to a project module, make sure the module is enabled
+        base_statement << " AND EXISTS (SELECT em.id FROM #{EnabledModule.table_name} em WHERE em.name='#{perm.project_module}' AND em.project_id=#{Project.table_name}.id)"
+      end
+    end
+    if options[:project]
+      project_statement = "#{Project.table_name}.id = #{options[:project].id}"
+      project_statement << " OR #{Project.table_name}.parent_id = #{options[:project].id}" if options[:with_subprojects]
+      base_statement = "(#{project_statement}) AND (#{base_statement})"
+    end
+    if user.admin?
+      # no restriction
+    else
+      statements << "1=0"
+      if user.logged?
+        statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
+        allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
+        statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
+      elsif Role.anonymous.allowed_to?(permission)
+        # anonymous user allowed on public project
+        statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" 
+      else
+        # anonymous user is not authorized
+      end
+    end
+    statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
+  end
+  
+  def project_condition(with_subprojects)
+    cond = "#{Project.table_name}.id = #{id}"
+    cond = "(#{cond} OR #{Project.table_name}.parent_id = #{id})" if with_subprojects
+    cond
+  end
+  
+  def self.find(*args)
+    if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
+      project = find_by_identifier(*args)
+      raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
+      project
+    else
+      super
+    end
+  end
+ 
+  def to_param
+    # id is used for projects with a numeric identifier (compatibility)
+    @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
+  end
+  
+  def active?
+    self.status == STATUS_ACTIVE
+  end
+  
+  def archive
+    # Archive subprojects if any
+    children.each do |subproject|
+      subproject.archive
+    end
+    update_attribute :status, STATUS_ARCHIVED
+  end
+  
+  def unarchive
+    return false if parent && !parent.active?
+    update_attribute :status, STATUS_ACTIVE
+  end
+  
+  def active_children
+    children.select {|child| child.active?}
+  end
+  
+  # Returns an array of the trackers used by the project and its sub projects
+  def rolled_up_trackers
+    @rolled_up_trackers ||=
+      Tracker.find(:all, :include => :projects,
+                         :select => "DISTINCT #{Tracker.table_name}.*",
+                         :conditions => ["#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?", id, id],
+                         :order => "#{Tracker.table_name}.position")
+  end
+  
+  # Deletes all project's members
+  def delete_all_members
+    Member.delete_all(['project_id = ?', id])
+  end
+  
+  # Users issues can be assigned to
+  def assignable_users
+    members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
+  end
+  
+  # Returns the mail adresses of users that should be always notified on project events
+  def recipients
+    members.select {|m| m.mail_notification? || m.user.mail_notification?}.collect {|m| m.user.mail}
+  end
+  
   # Returns an array of all custom fields enabled for project issues
   # (explictly associated custom fields and custom fields enabled for all projects)
-  def custom_fields_for_issues(tracker)
-    all_custom_fields.select {|c| tracker.custom_fields.include? c }
+  def all_issue_custom_fields
+    @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
   end
   
-  def all_custom_fields
-    @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
+  def project
+    self
+  end
+  
+  def <=>(project)
+    name.downcase <=> project.name.downcase
+  end
+  
+  def to_s
+    name
+  end
+  
+  # Returns a short description of the projects (first lines)
+  def short_description(length = 255)
+    description.gsub(/^(.{#{length}}[^\n]*).*$/m, '\1').strip if description
+  end
+  
+  def allows_to?(action)
+    if action.is_a? Hash
+      allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
+    else
+      allowed_permissions.include? action
+    end
+  end
+  
+  def module_enabled?(module_name)
+    module_name = module_name.to_s
+    enabled_modules.detect {|m| m.name == module_name}
+  end
+  
+  def enabled_module_names=(module_names)
+    enabled_modules.clear
+    module_names = [] unless module_names && module_names.is_a?(Array)
+    module_names.each do |name|
+      enabled_modules << EnabledModule.new(:name => name.to_s)
+    end
+  end
+  
+  # Returns an auto-generated project identifier based on the last identifier used
+  def self.next_identifier
+    p = Project.find(:first, :order => 'created_on DESC')
+    p.nil? ? nil : p.identifier.to_s.succ
   end
 
 protected
   def validate
     errors.add(parent_id, " must be a root project") if parent and parent.parent
     errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
+    errors.add(:identifier, :activerecord_error_invalid) if !identifier.blank? && identifier.match(/^\d*$/)
+  end
+  
+private
+  def allowed_permissions
+    @allowed_permissions ||= begin
+      module_names = enabled_modules.collect {|m| m.name}
+      Redmine::AccessControl.modules_permissions(module_names).collect {|p| p.name}
+    end
+  end
+
+  def allowed_actions
+    @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
   end
 end

app/models/query.rb

@@ -1,5 +1,5 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2008  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
@@ -15,14 +15,49 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+class QueryColumn  
+  attr_accessor :name, :sortable, :default_order
+  include GLoc
+  
+  def initialize(name, options={})
+    self.name = name
+    self.sortable = options[:sortable]
+    self.default_order = options[:default_order]
+  end
+  
+  def caption
+    set_language_if_valid(User.current.language)
+    l("field_#{name}")
+  end
+end
+
+class QueryCustomFieldColumn < QueryColumn
+
+  def initialize(custom_field)
+    self.name = "cf_#{custom_field.id}".to_sym
+    self.sortable = false
+    @cf = custom_field
+  end
+  
+  def caption
+    @cf.name
+  end
+  
+  def custom_field
+    @cf
+  end
+end
+
 class Query < ActiveRecord::Base
   belongs_to :project
   belongs_to :user
   serialize :filters
+  serialize :column_names
   
-  attr_protected :project, :user
+  attr_protected :project_id, :user_id
   
   validates_presence_of :name, :on => :save
+  validates_length_of :name, :maximum => 255
     
   @@operators = { "="   => :label_equals, 
                   "!"   => :label_not_equals,
@@ -30,10 +65,13 @@ class Query < ActiveRecord::Base
                   "c"   => :label_closed_issues,
                   "!*"  => :label_none,
                   "*"   => :label_all,
+                  ">="   => '>=',
+                  "<="   => '<=',
                   "<t+" => :label_in_less_than,
                   ">t+" => :label_in_more_than,
                   "t+"  => :label_in,
                   "t"   => :label_today,
+                  "w"   => :label_this_week,
                   ">t-" => :label_less_than_ago,
                   "<t-" => :label_more_than_ago,
                   "t-"  => :label_ago,
@@ -45,50 +83,104 @@ class Query < ActiveRecord::Base
   @@operators_by_filter_type = { :list => [ "=", "!" ],
                                  :list_status => [ "o", "=", "!", "c", "*" ],
                                  :list_optional => [ "=", "!", "!*", "*" ],
-                                 :list_one_or_more => [ "*", "=" ],
-                                 :date => [ "<t+", ">t+", "t+", "t", ">t-", "<t-", "t-" ],
-                                 :date_past => [ ">t-", "<t-", "t-", "t" ],
-                                 :text => [  "~", "!~" ] }
+                                 :list_subprojects => [ "*", "!*", "=" ],
+                                 :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
+                                 :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
+                                 :string => [ "=", "~", "!", "!~" ],
+                                 :text => [  "~", "!~" ],
+                                 :integer => [ "=", ">=", "<=", "!*", "*" ] }
 
   cattr_reader :operators_by_filter_type
 
+  @@available_columns = [
+    QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
+    QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
+    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
+    QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
+    QueryColumn.new(:author),
+    QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
+    QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
+    QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
+    QueryColumn.new(:fixed_version, :sortable => "#{Version.table_name}.effective_date", :default_order => 'desc'),
+    QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
+    QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
+    QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
+    QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
+    QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
+  ]
+  cattr_reader :available_columns
+  
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-    self.is_public = true
+    set_language_if_valid(User.current.language)
+  end
+  
+  def after_initialize
+    # Store the fact that project is nil (used in #editable_by?)
+    @is_for_all = project.nil?
   end
   
   def validate
     filters.each_key do |field|
-      errors.add field.gsub(/\_id$/, ""), :activerecord_error_blank unless 
+      errors.add label_for(field), :activerecord_error_blank unless 
           # filter requires one or more values
-          (values_for(field) and !values_for(field).first.empty?) or 
+          (values_for(field) and !values_for(field).first.blank?) or 
           # filter doesn't require any value
-          ["o", "c", "!*", "*", "t"].include? operator_for(field)
+          ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
     end if filters
   end
   
+  def editable_by?(user)
+    return false unless user
+    # Admin can edit them all and regular users can edit their private queries
+    return true if user.admin? || (!is_public && self.user_id == user.id)
+    # Members can not edit public queries that are for all project (only admin is allowed to)
+    is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
+  end
+  
   def available_filters
     return @available_filters if @available_filters
+    
+    trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
+    
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
-                           "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },                                                                                                                
-                           "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
+                           "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },                                                                                                                
+                           "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI'], :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                            "subject" => { :type => :text, :order => 8 },  
                            "created_on" => { :type => :date_past, :order => 9 },                        
                            "updated_on" => { :type => :date_past, :order => 10 },
                            "start_date" => { :type => :date, :order => 11 },
-                           "due_date" => { :type => :date, :order => 12 } }                          
-    unless project.nil?
+                           "due_date" => { :type => :date, :order => 12 },
+                           "estimated_hours" => { :type => :integer, :order => 13 },
+                           "done_ratio" =>  { :type => :integer, :order => 14 }}
+    
+    user_values = []
+    user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
+    if project
+      user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
+    else
+      # members of the user's projects
+      user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
+    end
+    @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
+    @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
+  
+    if project
       # project specific filters
-      @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
-      @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }  
-      @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
-      @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
-      unless @project.children.empty?
-        @available_filters["subproject_id"] = { :type => :list_one_or_more, :order => 13, :values => @project.children.collect{|s| [s.name, s.id.to_s] } }
+      unless @project.issue_categories.empty?
+        @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
       end
-      # remove category filter if no category defined
-      @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty?
+      unless @project.versions.empty?
+        @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
+      end
+      unless @project.active_children.empty?
+        @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
+      end
+      add_custom_fields_filters(@project.all_issue_custom_fields)
+    else
+      # global filters for cross project issue list
+      add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
     end
     @available_filters
   end
@@ -126,57 +218,189 @@ class Query < ActiveRecord::Base
     has_filter?(field) ? filters[field][:values] : nil
   end
   
-  def statement
-    sql = "1=1"
-    if has_filter?("subproject_id")
-      subproject_ids = []
-      if operator_for("subproject_id") == "="
-        subproject_ids = values_for("subproject_id").each(&:to_i)
-      else
-        subproject_ids = project.children.collect{|p| p.id}
-      end
-      sql << " AND #{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
+  def label_for(field)
+    label = available_filters[field][:name] if available_filters.has_key?(field)
+    label ||= field.gsub(/\_id$/, "")
+  end
+
+  def available_columns
+    return @available_columns if @available_columns
+    @available_columns = Query.available_columns
+    @available_columns += (project ? 
+                            project.all_issue_custom_fields :
+                            IssueCustomField.find(:all, :conditions => {:is_for_all => true})
+                           ).collect {|cf| QueryCustomFieldColumn.new(cf) }      
+  end
+  
+  def columns
+    if has_default_columns?
+      available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
     else
-      sql << " AND #{Issue.table_name}.project_id=%d" % project.id if project
+      # preserve the column_names order
+      column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
     end
+  end
+  
+  def column_names=(names)
+    names = names.select {|n| n.is_a?(Symbol) || !n.blank? } if names
+    names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym } if names
+    write_attribute(:column_names, names)
+  end
+  
+  def has_column?(column)
+    column_names && column_names.include?(column.name)
+  end
+  
+  def has_default_columns?
+    column_names.nil? || column_names.empty?
+  end
+  
+  def project_statement
+    project_clauses = []
+    if project && !@project.active_children.empty?
+      ids = [project.id]
+      if has_filter?("subproject_id")
+        case operator_for("subproject_id")
+        when '='
+          # include the selected subprojects
+          ids += values_for("subproject_id").each(&:to_i)
+        when '!*'
+          # main project only
+        else
+          # all subprojects
+          ids += project.child_ids
+        end
+      elsif Setting.display_subprojects_issues?
+        ids += project.child_ids
+      end
+      project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
+    elsif project
+      project_clauses << "#{Project.table_name}.id = %d" % project.id
+    end
+    project_clauses <<  Project.allowed_to_condition(User.current, :view_issues)
+    project_clauses.join(' AND ')
+  end
+
+  def statement
+    # filters clauses
+    filters_clauses = []
     filters.each_key do |field|
       next if field == "subproject_id"
-      v = values_for field
-      next unless v and !v.empty?  
-      sql = sql + " AND " unless sql.empty?      
-      case operator_for field
-      when "="
-        sql = sql + "#{Issue.table_name}.#{field} IN (" + v.each(&:to_i).join(",") + ")"
-      when "!"
-        sql = sql + "#{Issue.table_name}.#{field} NOT IN (" + v.each(&:to_i).join(",") + ")"
-      when "!*"
-        sql = sql + "#{Issue.table_name}.#{field} IS NULL"
-      when "*"
-        sql = sql + "#{Issue.table_name}.#{field} IS NOT NULL"
-      when "o"
-        sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
-      when "c"
-        sql = sql + "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
-      when ">t-"
-        sql = sql + "#{Issue.table_name}.#{field} >= '%s'" % connection.quoted_date(Date.today - v.first.to_i)
-      when "<t-"
-        sql = sql + "#{Issue.table_name}.#{field} <= '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
-      when "t-"
-        sql = sql + "#{Issue.table_name}.#{field} = '" + (Date.today - v.first.to_i).strftime("%Y-%m-%d") + "'"
-      when ">t+"
-        sql = sql + "#{Issue.table_name}.#{field} >= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
-      when "<t+"
-        sql = sql + "#{Issue.table_name}.#{field} <= '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
-      when "t+"
-        sql = sql + "#{Issue.table_name}.#{field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'"
-      when "t"
-        sql = sql + "#{Issue.table_name}.#{field} = '%s'" % connection.quoted_date(Date.today)
-      when "~"
-        sql = sql + "#{Issue.table_name}.#{field} LIKE '%#{connection.quote_string(v.first)}%'"
-      when "!~"
-        sql = sql + "#{Issue.table_name}.#{field} NOT LIKE '%#{connection.quote_string(v.first)}%'"
+      v = values_for(field).clone
+      next unless v and !v.empty?
+            
+      sql = ''
+      is_custom_filter = false
+      if field =~ /^cf_(\d+)$/
+        # custom field
+        db_table = CustomValue.table_name
+        db_field = 'value'
+        is_custom_filter = true
+        sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
+      else
+        # regular field
+        db_table = Issue.table_name
+        db_field = field
+        sql << '('
       end
+      
+      # "me" value subsitution
+      if %w(assigned_to_id author_id).include?(field)
+        v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
+      end
+      
+      sql = sql + sql_for_field(field, v, db_table, db_field, is_custom_filter)
+      
+      sql << ')'
+      filters_clauses << sql
     end if filters and valid?
-    sql
+    
+    (filters_clauses << project_statement).join(' AND ')
+  end
+  
+  private
+  
+  # Helper method to generate the WHERE sql for a +field+ with a +value+
+  def sql_for_field(field, value, db_table, db_field, is_custom_filter)
+    sql = ''
+    case operator_for field
+    when "="
+      sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+    when "!"
+      sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
+    when "!*"
+      sql = "#{db_table}.#{db_field} IS NULL"
+      sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
+    when "*"
+      sql = "#{db_table}.#{db_field} IS NOT NULL"
+      sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
+    when ">="
+      sql = "#{db_table}.#{db_field} >= #{value.first.to_i}"
+    when "<="
+      sql = "#{db_table}.#{db_field} <= #{value.first.to_i}"
+    when "o"
+      sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_false}" if field == "status_id"
+    when "c"
+      sql = "#{IssueStatus.table_name}.is_closed=#{connection.quoted_true}" if field == "status_id"
+    when ">t-"
+      sql = date_range_clause(db_table, db_field, - value.first.to_i, 0)
+    when "<t-"
+      sql = date_range_clause(db_table, db_field, nil, - value.first.to_i)
+    when "t-"
+      sql = date_range_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
+    when ">t+"
+      sql = date_range_clause(db_table, db_field, value.first.to_i, nil)
+    when "<t+"
+      sql = date_range_clause(db_table, db_field, 0, value.first.to_i)
+    when "t+"
+      sql = date_range_clause(db_table, db_field, value.first.to_i, value.first.to_i)
+    when "t"
+      sql = date_range_clause(db_table, db_field, 0, 0)
+    when "w"
+      from = l(:general_first_day_of_week) == '7' ?
+      # week starts on sunday
+      ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
+        # week starts on monday (Rails default)
+        Time.now.at_beginning_of_week
+      sql = "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
+    when "~"
+      sql = "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(value.first)}%'"
+    when "!~"
+      sql = "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(value.first)}%'"
+    end
+    
+    return sql
+  end
+  
+  def add_custom_fields_filters(custom_fields)
+    @available_filters ||= {}
+    
+    custom_fields.select(&:is_filter?).each do |field|
+      case field.field_format
+      when "text"
+        options = { :type => :text, :order => 20 }
+      when "list"
+        options = { :type => :list_optional, :values => field.possible_values, :order => 20}
+      when "date"
+        options = { :type => :date, :order => 20 }
+      when "bool"
+        options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
+      else
+        options = { :type => :string, :order => 20 }
+      end
+      @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
+    end
+  end
+  
+  # Returns a SQL clause for a date or datetime field.
+  def date_range_clause(table, field, from, to)
+    s = []
+    if from
+      s << ("#{table}.#{field} > '%s'" % [connection.quoted_date((Date.yesterday + from).to_time.end_of_day)])
+    end
+    if to
+      s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date((Date.today + to).to_time.end_of_day)])
+    end
+    s.join(' AND ')
   end
 end

app/models/repository.rb

@@ -17,65 +17,121 @@
 
 class Repository < ActiveRecord::Base
   belongs_to :project
-  has_many :changesets, :dependent => :destroy, :order => 'revision DESC'
+  has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
   has_many :changes, :through => :changesets
-  has_one  :latest_changeset, :class_name => 'Changeset', :foreign_key => :repository_id, :order => 'revision DESC'
   
-  attr_protected :root_url
+  # Raw SQL to delete changesets and changes in the database
+  # has_many :changesets, :dependent => :destroy is too slow for big repositories
+  before_destroy :clear_changesets
   
-  validates_presence_of :url
-  validates_format_of :url, :with => /^(http|https|svn|file):\/\/.+/i
-    
+  # Checks if the SCM is enabled when creating a repository
+  validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
+  
+  # Removes leading and trailing whitespace
+  def url=(arg)
+    write_attribute(:url, arg ? arg.to_s.strip : nil)
+  end
+  
+  # Removes leading and trailing whitespace
+  def root_url=(arg)
+    write_attribute(:root_url, arg ? arg.to_s.strip : nil)
+  end
+
   def scm
-    @scm ||= SvnRepos::Base.new url, root_url, login, password
+    @scm ||= self.scm_adapter.new url, root_url, login, password
     update_attribute(:root_url, @scm.root_url) if root_url.blank?
     @scm
   end
   
-  def url=(str)
-    super if root_url.blank?
+  def scm_name
+    self.class.scm_name
   end
   
-  def changesets_with_path(path="")
-    path = "/#{path}%"
-    path = url.gsub(/^#{root_url}/, '') + path if root_url && root_url != url
-    path.squeeze!("/")
-    Changeset.with_scope(:find => { :include => :changes, :conditions => ["#{Change.table_name}.path LIKE ?", path] }) do 
-      yield
-    end 
+  def supports_cat?
+    scm.supports_cat?
+  end
+
+  def supports_annotate?
+    scm.supports_annotate?
   end
   
-  def fetch_changesets
-    scm_info = scm.info
-    if scm_info
-      lastrev_identifier = scm_info.lastrev.identifier.to_i
-      if latest_changeset.nil? || latest_changeset.revision < lastrev_identifier
-        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
-        identifier_from = latest_changeset ? latest_changeset.revision + 1 : 1
-        while (identifier_from <= lastrev_identifier)
-          # loads changesets by batches of 200
-          identifier_to = [identifier_from + 199, lastrev_identifier].min
-          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
-          transaction do
-            revisions.reverse_each do |revision|
-              changeset = Changeset.create(:repository => self,
-                                           :revision => revision.identifier, 
-                                           :committer => revision.author, 
-                                           :committed_on => revision.time,
-                                           :comment => revision.message)
-              
-              revision.paths.each do |change|
-                Change.create(:changeset => changeset,
-                              :action => change[:action],
-                              :path => change[:path],
-                              :from_path => change[:from_path],
-                              :from_revision => change[:from_revision])
-              end
-            end
-          end unless revisions.nil?
-          identifier_from = identifier_to + 1
+  def entry(path=nil, identifier=nil)
+    scm.entry(path, identifier)
+  end
+  
+  def entries(path=nil, identifier=nil)
+    scm.entries(path, identifier)
+  end
+  
+  def properties(path, identifier=nil)
+    scm.properties(path, identifier)
+  end
+  
+  def cat(path, identifier=nil)
+    scm.cat(path, identifier)
+  end
+  
+  def diff(path, rev, rev_to)
+    scm.diff(path, rev, rev_to)
+  end
+  
+  # Default behaviour: we search in cached changesets
+  def changesets_for_path(path)
+    path = "/#{path}" unless path.starts_with?('/')
+    Change.find(:all, :include => {:changeset => :user}, 
+      :conditions => ["repository_id = ? AND path = ?", id, path],
+      :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
+  end
+  
+  # Returns a path relative to the url of the repository
+  def relative_path(path)
+    path
+  end
+  
+  def latest_changeset
+    @latest_changeset ||= changesets.find(:first)
+  end
+    
+  def scan_changesets_for_issue_ids
+    self.changesets.each(&:scan_comment_for_issue_ids)
+  end
+  
+  # Returns an array of committers usernames and associated user_id
+  def committers
+    @committers ||= Changeset.connection.select_rows("SELECT DISTINCT committer, user_id FROM #{Changeset.table_name} WHERE repository_id = #{id}")
+  end
+  
+  # Maps committers username to a user ids
+  def committer_ids=(h)
+    if h.is_a?(Hash)
+      committers.each do |committer, user_id|
+        new_user_id = h[committer]
+        if new_user_id && (new_user_id.to_i != user_id.to_i)
+          new_user_id = (new_user_id.to_i > 0 ? new_user_id.to_i : nil)
+          Changeset.update_all("user_id = #{ new_user_id.nil? ? 'NULL' : new_user_id }", ["repository_id = ? AND committer = ?", id, committer])
         end
       end
+      @committers = nil
+      true
+    else
+      false
+    end
+  end
+  
+  # Returns the Redmine User corresponding to the given +committer+
+  # It will return nil if the committer is not yet mapped and if no User
+  # with the same username or email was found
+  def find_committer_user(committer)
+    if committer
+      c = changesets.find(:first, :conditions => {:committer => committer}, :include => :user)
+      if c && c.user
+        c.user
+      elsif committer.strip =~ /^([^<]+)(<(.*)>)?$/
+        username, email = $1.strip, $3
+        u = User.find_by_login(username)
+        u ||= User.find_by_mail(email) unless email.blank?
+        u
+      end
     end
   end
   
@@ -85,4 +141,39 @@ class Repository < ActiveRecord::Base
   def self.fetch_changesets
     find(:all).each(&:fetch_changesets)
   end
+  
+  # scan changeset comments to find related and fixed issues for all repositories
+  def self.scan_changesets_for_issue_ids
+    find(:all).each(&:scan_changesets_for_issue_ids)
+  end
+
+  def self.scm_name
+    'Abstract'
+  end
+  
+  def self.available_scm
+    subclasses.collect {|klass| [klass.scm_name, klass.name]}
+  end
+  
+  def self.factory(klass_name, *args)
+    klass = "Repository::#{klass_name}".constantize
+    klass.new(*args)
+  rescue
+    nil
+  end
+  
+  private
+  
+  def before_save
+    # Strips url and root_url
+    url.strip!
+    root_url.strip!
+    true
+  end
+  
+  def clear_changesets
+    connection.delete("DELETE FROM changes WHERE changes.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
+    connection.delete("DELETE FROM changesets_issues WHERE changesets_issues.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
+    connection.delete("DELETE FROM changesets WHERE changesets.repository_id = #{id}")
+  end
 end

app/models/repository/bazaar.rb

@@ -0,0 +1,91 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+require 'redmine/scm/adapters/bazaar_adapter'
+
+class Repository::Bazaar < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::BazaarAdapter
+  end
+  
+  def self.scm_name
+    'Bazaar'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries = scm.entries(path, identifier)
+    if entries
+      entries.each do |e|
+        next if e.lastrev.revision.blank?
+        # Set the filesize unless browsing a specific revision
+        if identifier.nil? && e.is_file?
+          full_path = File.join(root_url, e.path)
+          e.size = File.stat(full_path).size if File.file?(full_path)
+        end
+        c = Change.find(:first,
+                        :include => :changeset,
+                        :conditions => ["#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id],
+                        :order => "#{Changeset.table_name}.revision DESC")
+        if c
+          e.lastrev.identifier = c.changeset.revision
+          e.lastrev.name = c.changeset.revision
+          e.lastrev.author = c.changeset.committer
+        end
+      end
+    end
+  end
+  
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.identifier.to_i
+      if db_revision < scm_revision
+        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
+        identifier_from = db_revision + 1
+        while (identifier_from <= scm_revision)
+          # loads changesets by batches of 200
+          identifier_to = [identifier_from + 199, scm_revision].min
+          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
+          transaction do
+            revisions.reverse_each do |revision|
+              changeset = Changeset.create(:repository => self,
+                                           :revision => revision.identifier, 
+                                           :committer => revision.author, 
+                                           :committed_on => revision.time,
+                                           :scmid => revision.scmid,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :revision => change[:revision])
+              end
+            end
+          end unless revisions.nil?
+          identifier_from = identifier_to + 1
+        end
+      end
+    end
+  end
+end

app/models/repository/cvs.rb

@@ -0,0 +1,161 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+require 'redmine/scm/adapters/cvs_adapter'
+require 'digest/sha1'
+
+class Repository::Cvs < Repository
+  validates_presence_of :url, :root_url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::CvsAdapter
+  end
+  
+  def self.scm_name
+    'CVS'
+  end
+  
+  def entry(path=nil, identifier=nil)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.entry(path, rev.nil? ? nil : rev.committed_on)
+  end
+  
+  def entries(path=nil, identifier=nil)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
+    if entries
+      entries.each() do |entry|
+        unless entry.lastrev.nil? || entry.lastrev.identifier
+          change=changes.find_by_revision_and_path( entry.lastrev.revision, scm.with_leading_slash(entry.path) )
+          if change
+            entry.lastrev.identifier=change.changeset.revision
+            entry.lastrev.author=change.changeset.committer
+            entry.lastrev.revision=change.revision
+            entry.lastrev.branch=change.branch
+          end
+        end
+      end
+    end
+    entries
+  end
+  
+  def cat(path, identifier=nil)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.cat(path, rev.nil? ? nil : rev.committed_on)
+  end
+  
+  def diff(path, rev, rev_to)
+    #convert rev to revision. CVS can't handle changesets here
+    diff=[]
+    changeset_from=changesets.find_by_revision(rev)
+    if rev_to.to_i > 0 
+      changeset_to=changesets.find_by_revision(rev_to)
+    end
+    changeset_from.changes.each() do |change_from|
+      
+      revision_from=nil
+      revision_to=nil      
+      
+      revision_from=change_from.revision if path.nil? || (change_from.path.starts_with? scm.with_leading_slash(path))
+      
+      if revision_from
+        if changeset_to
+          changeset_to.changes.each() do |change_to|
+            revision_to=change_to.revision if change_to.path==change_from.path 
+          end
+        end
+        unless revision_to
+          revision_to=scm.get_previous_revision(revision_from)
+        end
+        file_diff = scm.diff(change_from.path, revision_from, revision_to)
+        diff = diff + file_diff unless file_diff.nil?
+      end
+    end
+    return diff
+  end
+  
+  def fetch_changesets
+    # some nifty bits to introduce a commit-id with cvs
+    # natively cvs doesn't provide any kind of changesets, there is only a revision per file.
+    # we now take a guess using the author, the commitlog and the commit-date.
+    
+    # last one is the next step to take. the commit-date is not equal for all 
+    # commits in one changeset. cvs update the commit-date when the *,v file was touched. so
+    # we use a small delta here, to merge all changes belonging to _one_ changeset
+    time_delta=10.seconds
+    
+    fetch_since = latest_changeset ? latest_changeset.committed_on : nil
+    transaction do
+      tmp_rev_num = 1
+      scm.revisions('', fetch_since, nil, :with_paths => true) do |revision|
+        # only add the change to the database, if it doen't exists. the cvs log
+        # is not exclusive at all. 
+        unless changes.find_by_path_and_revision(scm.with_leading_slash(revision.paths[0][:path]), revision.paths[0][:revision])
+          revision
+          cs = changesets.find(:first, :conditions=>{
+            :committed_on=>revision.time-time_delta..revision.time+time_delta,
+            :committer=>revision.author,
+            :comments=>Changeset.normalize_comments(revision.message)
+          })
+        
+          # create a new changeset.... 
+          unless cs
+            # we use a temporaray revision number here (just for inserting)
+            # later on, we calculate a continous positive number
+            latest = changesets.find(:first, :order => 'id DESC')
+            cs = Changeset.create(:repository => self,
+                                  :revision => "_#{tmp_rev_num}", 
+                                  :committer => revision.author, 
+                                  :committed_on => revision.time,
+                                  :comments => revision.message)
+            tmp_rev_num += 1
+          end
+        
+          #convert CVS-File-States to internal Action-abbrevations
+          #default action is (M)odified
+          action="M"
+          if revision.paths[0][:action]=="Exp" && revision.paths[0][:revision]=="1.1"
+            action="A" #add-action always at first revision (= 1.1)
+          elsif revision.paths[0][:action]=="dead"
+            action="D" #dead-state is similar to Delete
+          end
+        
+          Change.create(:changeset => cs,
+          :action => action,
+          :path => scm.with_leading_slash(revision.paths[0][:path]),
+          :revision => revision.paths[0][:revision],
+          :branch => revision.paths[0][:branch]
+          )
+        end
+      end
+      
+      # Renumber new changesets in chronological order
+      changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
+        changeset.update_attribute :revision, next_revision_number
+      end
+    end # transaction
+  end
+  
+  private
+  
+  # Returns the next revision number to assign to a CVS changeset
+  def next_revision_number
+    # Need to retrieve existing revision numbers to sort them as integers
+    @current_revision_number ||= (connection.select_values("SELECT revision FROM #{Changeset.table_name} WHERE repository_id = #{id} AND revision NOT LIKE '_%'").collect(&:to_i).max || 0)
+    @current_revision_number += 1
+  end
+end

app/models/repository/darcs.rb

@@ -0,0 +1,100 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+require 'redmine/scm/adapters/darcs_adapter'
+
+class Repository::Darcs < Repository
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::DarcsAdapter
+  end
+  
+  def self.scm_name
+    'Darcs'
+  end
+  
+  def entry(path=nil, identifier=nil)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.entry(path, patch.nil? ? nil : patch.scmid)
+  end
+  
+  def entries(path=nil, identifier=nil)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
+    if entries
+      entries.each do |entry|
+        # Search the DB for the entry's last change
+        changeset = changesets.find_by_scmid(entry.lastrev.scmid) if entry.lastrev && !entry.lastrev.scmid.blank?
+        if changeset
+          entry.lastrev.identifier = changeset.revision
+          entry.lastrev.name = changeset.revision
+          entry.lastrev.time = changeset.committed_on
+          entry.lastrev.author = changeset.committer
+        end
+      end
+    end
+    entries
+  end
+  
+  def cat(path, identifier=nil)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier.to_s)
+    scm.cat(path, patch.nil? ? nil : patch.scmid)
+  end
+  
+  def diff(path, rev, rev_to)
+    patch_from = changesets.find_by_revision(rev)
+    return nil if patch_from.nil?
+    patch_to = changesets.find_by_revision(rev_to) if rev_to
+    if path.blank?
+      path = patch_from.changes.collect{|change| change.path}.join(' ')
+    end
+    patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
+  end
+  
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      db_last_id = latest_changeset ? latest_changeset.scmid : nil
+      next_rev = latest_changeset ? latest_changeset.revision.to_i + 1 : 1      
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.scmid      
+      unless changesets.find_by_scmid(scm_revision)
+        revisions = scm.revisions('', db_last_id, nil, :with_path => true)
+        transaction do
+          revisions.reverse_each do |revision|
+            changeset = Changeset.create(:repository => self,
+                                         :revision => next_rev,
+                                         :scmid => revision.scmid,
+                                         :committer => revision.author, 
+                                         :committed_on => revision.time,
+                                         :comments => revision.message)
+                                         
+            revision.paths.each do |change|
+              Change.create(:changeset => changeset,
+                            :action => change[:action],
+                            :path => change[:path],
+                            :from_path => change[:from_path],
+                            :from_revision => change[:from_revision])
+            end
+            next_rev += 1
+          end if revisions
+        end
+      end
+    end
+  end
+end

app/models/repository/filesystem.rb

@@ -0,0 +1,43 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# FileSystem adapter
+# File written by Paul Rivier, at Demotera.
+#
+# 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.
+
+require 'redmine/scm/adapters/filesystem_adapter'
+
+class Repository::Filesystem < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::FilesystemAdapter
+  end
+  
+  def self.scm_name
+    'Filesystem'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    scm.entries(path, identifier)
+  end
+
+  def fetch_changesets
+    nil
+  end
+  
+end

app/models/repository/git.rb

@@ -0,0 +1,70 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2007  Patrick Aljord patcito@ŋmail.com
+# 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.
+
+require 'redmine/scm/adapters/git_adapter'
+
+class Repository::Git < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::GitAdapter
+  end
+  
+  def self.scm_name
+    'Git'
+  end
+
+  def changesets_for_path(path)
+    Change.find(:all, :include => {:changeset => :user}, 
+                :conditions => ["repository_id = ? AND path = ?", id, path],
+                :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
+  end
+
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision : nil
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.scmid
+
+      unless changesets.find_by_scmid(scm_revision)
+        scm.revisions('', db_revision, nil, :reverse => true) do |revision|
+          if changesets.find_by_scmid(revision.scmid.to_s).nil?
+            transaction do
+              changeset = Changeset.create!(:repository => self,
+                                           :revision => revision.identifier,
+                                           :scmid => revision.scmid,
+                                           :committer => revision.author, 
+                                           :committed_on => revision.time,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create!(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :from_path => change[:from_path],
+                              :from_revision => change[:from_revision])
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

app/models/repository/mercurial.rb

@@ -0,0 +1,94 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+require 'redmine/scm/adapters/mercurial_adapter'
+
+class Repository::Mercurial < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::MercurialAdapter
+  end
+  
+  def self.scm_name
+    'Mercurial'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries=scm.entries(path, identifier)
+    if entries
+      entries.each do |entry|
+        next unless entry.is_file?
+        # Set the filesize unless browsing a specific revision
+        if identifier.nil?
+          full_path = File.join(root_url, entry.path)
+          entry.size = File.stat(full_path).size if File.file?(full_path)
+        end
+        # Search the DB for the entry's last change
+        change = changes.find(:first, :conditions => ["path = ?", scm.with_leading_slash(entry.path)], :order => "#{Changeset.table_name}.committed_on DESC")
+        if change
+          entry.lastrev.identifier = change.changeset.revision
+          entry.lastrev.name = change.changeset.revision
+          entry.lastrev.author = change.changeset.committer
+          entry.lastrev.revision = change.revision
+        end
+      end
+    end
+    entries
+  end
+
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : -1
+      # latest revision in the repository
+      latest_revision = scm_info.lastrev
+      return if latest_revision.nil?
+      scm_revision = latest_revision.identifier.to_i
+      if db_revision < scm_revision
+        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
+        identifier_from = db_revision + 1
+        while (identifier_from <= scm_revision)
+          # loads changesets by batches of 100
+          identifier_to = [identifier_from + 99, scm_revision].min
+          revisions = scm.revisions('', identifier_from, identifier_to, :with_paths => true)
+          transaction do
+            revisions.each do |revision|
+              changeset = Changeset.create(:repository => self,
+                                           :revision => revision.identifier,
+                                           :scmid => revision.scmid,
+                                           :committer => revision.author, 
+                                           :committed_on => revision.time,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :from_path => change[:from_path],
+                              :from_revision => change[:from_revision])
+              end
+            end
+          end unless revisions.nil?
+          identifier_from = identifier_to + 1
+        end
+      end
+    end
+  end
+end

app/models/repository/subversion.rb

@@ -0,0 +1,89 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  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.
+
+require 'redmine/scm/adapters/subversion_adapter'
+
+class Repository::Subversion < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+  validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i
+
+  def scm_adapter
+    Redmine::Scm::Adapters::SubversionAdapter
+  end
+  
+  def self.scm_name
+    'Subversion'
+  end
+
+  def changesets_for_path(path)
+    revisions = scm.revisions(path)
+    revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC", :include => :user) : []
+  end
+  
+  # Returns a path relative to the url of the repository
+  def relative_path(path)
+    path.gsub(Regexp.new("^\/?#{Regexp.escape(relative_url)}"), '')
+  end
+  
+  def fetch_changesets
+    scm_info = scm.info
+    if scm_info
+      # latest revision found in database
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
+      # latest revision in the repository
+      scm_revision = scm_info.lastrev.identifier.to_i
+      if db_revision < scm_revision
+        logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
+        identifier_from = db_revision + 1
+        while (identifier_from <= scm_revision)
+          # loads changesets by batches of 200
+          identifier_to = [identifier_from + 199, scm_revision].min
+          revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
+          transaction do
+            revisions.reverse_each do |revision|
+              changeset = Changeset.create(:repository => self,
+                                           :revision => revision.identifier, 
+                                           :committer => revision.author, 
+                                           :committed_on => revision.time,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :from_path => change[:from_path],
+                              :from_revision => change[:from_revision])
+              end
+            end
+          end unless revisions.nil?
+          identifier_from = identifier_to + 1
+        end
+      end
+    end
+  end
+  
+  private
+  
+  # Returns the relative url of the repository
+  # Eg: root_url = file:///var/svn/foo
+  #     url      = file:///var/svn/foo/bar
+  #     => returns /bar
+  def relative_url
+    @relative_url ||= url.gsub(Regexp.new("^#{Regexp.escape(root_url)}"), '')
+  end
+end

app/models/role.rb

@@ -16,22 +16,132 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Role < ActiveRecord::Base
-  before_destroy :check_integrity  
-  has_and_belongs_to_many :permissions
-  has_many :workflows, :dependent => :delete_all
+  # Built-in roles
+  BUILTIN_NON_MEMBER = 1
+  BUILTIN_ANONYMOUS  = 2
+
+  named_scope :builtin, lambda { |*args|
+    compare = 'not' if args.first == true
+    { :conditions => "#{compare} builtin = 0" }
+  }
+  
+  before_destroy :check_deletable
+  has_many :workflows, :dependent => :delete_all do
+    def copy(role)
+      raise "Can not copy workflow from a #{role.class}" unless role.is_a?(Role)
+      raise "Can not copy workflow from/to an unsaved role" if proxy_owner.new_record? || role.new_record?
+      clear
+      connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
+                        " SELECT tracker_id, old_status_id, new_status_id, #{proxy_owner.id}" +
+                        " FROM workflows" +
+                        " WHERE role_id = #{role.id}"
+    end
+  end
+  
   has_many :members
   acts_as_list
+  
+  serialize :permissions, Array
+  attr_protected :builtin
 
   validates_presence_of :name
   validates_uniqueness_of :name
+  validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
 
+  def permissions
+    read_attribute(:permissions) || []
+  end
+  
+  def permissions=(perms)
+    perms = perms.collect {|p| p.to_sym unless p.blank? }.compact.uniq if perms
+    write_attribute(:permissions, perms)
+  end
+
+  def add_permission!(*perms)
+    self.permissions = [] unless permissions.is_a?(Array)
+
+    permissions_will_change!
+    perms.each do |p|
+      p = p.to_sym
+      permissions << p unless permissions.include?(p)
+    end
+    save!
+  end
+
+  def remove_permission!(*perms)
+    return unless permissions.is_a?(Array)
+    permissions_will_change!
+    perms.each { |p| permissions.delete(p.to_sym) }
+    save!
+  end
+  
+  # Returns true if the role has the given permission
+  def has_permission?(perm)
+    !permissions.nil? && permissions.include?(perm.to_sym)
+  end
+  
   def <=>(role)
     position <=> role.position
   end
   
+  # Return true if the role is a builtin role
+  def builtin?
+    self.builtin != 0
+  end
+  
+  # Return true if the role is a project member role
+  def member?
+    !self.builtin?
+  end
+  
+  # Return true if role is allowed to do the specified action
+  # action can be:
+  # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
+  # * a permission Symbol (eg. :edit_project)
+  def allowed_to?(action)
+    if action.is_a? Hash
+      allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
+    else
+      allowed_permissions.include? action
+    end
+  end
+  
+  # Return all the permissions that can be given to the role
+  def setable_permissions
+    setable_permissions = Redmine::AccessControl.permissions - Redmine::AccessControl.public_permissions
+    setable_permissions -= Redmine::AccessControl.members_only_permissions if self.builtin == BUILTIN_NON_MEMBER
+    setable_permissions -= Redmine::AccessControl.loggedin_only_permissions if self.builtin == BUILTIN_ANONYMOUS
+    setable_permissions
+  end
+
+  # Find all the roles that can be given to a project member
+  def self.find_all_givable
+    find(:all, :conditions => {:builtin => 0}, :order => 'position')
+  end
+
+  # Return the builtin 'non member' role
+  def self.non_member
+    find(:first, :conditions => {:builtin => BUILTIN_NON_MEMBER}) || raise('Missing non-member builtin role.')
+  end
+
+  # Return the builtin 'anonymous' role 
+  def self.anonymous
+    find(:first, :conditions => {:builtin => BUILTIN_ANONYMOUS}) || raise('Missing anonymous builtin role.')
+  end
+
+  
 private
-  def check_integrity
-    raise "Can't delete role" if Member.find(:first, :conditions =>["role_id=?", self.id])
+  def allowed_permissions
+    @allowed_permissions ||= permissions + Redmine::AccessControl.public_permissions.collect {|p| p.name}
+  end
+
+  def allowed_actions
+    @actions_allowed ||= allowed_permissions.inject([]) { |actions, permission| actions += Redmine::AccessControl.allowed_actions(permission) }.flatten
+  end
+    
+  def check_deletable
+    raise "Can't delete role" if members.any?
+    raise "Can't delete builtin role" if builtin?
   end
 end

app/models/setting.rb

@@ -17,31 +17,107 @@
 
 class Setting < ActiveRecord::Base
 
+  DATE_FORMATS = [
+	'%Y-%m-%d',
+	'%d/%m/%Y',
+	'%d.%m.%Y',
+	'%d-%m-%Y',
+	'%m/%d/%Y',
+	'%d %b %Y',
+	'%d %B %Y',
+	'%b %d, %Y',
+	'%B %d, %Y'
+    ]
+    
+  TIME_FORMATS = [
+    '%H:%M',
+    '%I:%M %p'
+    ]
+    
+  ENCODINGS = %w(US-ASCII
+                  windows-1250
+                  windows-1251
+                  windows-1252
+                  windows-1253
+                  windows-1254
+                  windows-1255
+                  windows-1256
+                  windows-1257
+                  windows-1258
+                  windows-31j
+                  ISO-2022-JP
+                  ISO-2022-KR
+                  ISO-8859-1
+                  ISO-8859-2
+                  ISO-8859-3
+                  ISO-8859-4
+                  ISO-8859-5
+                  ISO-8859-6
+                  ISO-8859-7
+                  ISO-8859-8
+                  ISO-8859-9
+                  ISO-8859-13
+                  ISO-8859-15
+                  KOI8-R
+                  UTF-8
+                  UTF-16
+                  UTF-16BE
+                  UTF-16LE
+                  EUC-JP
+                  Shift_JIS
+                  GB18030
+                  GBK
+                  ISCII91
+                  EUC-KR
+                  Big5
+                  Big5-HKSCS
+                  TIS-620)
+  
   cattr_accessor :available_settings
   @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
-
+  Redmine::Plugin.all.each do |plugin|
+    next unless plugin.settings
+    @@available_settings["plugin_#{plugin.id}"] = {'default' => plugin.settings[:default], 'serialized' => true}    
+  end
+  
   validates_uniqueness_of :name
   validates_inclusion_of :name, :in => @@available_settings.keys
   validates_numericality_of :value, :only_integer => true, :if => Proc.new { |setting| @@available_settings[setting.name]['format'] == 'int' }  
+
+  # Hash used to cache setting values
+  @cached_settings = {}
+  @cached_cleared_on = Time.now
   
-  def self.get(name)
-    name = name.to_s
-    setting = find_by_name(name)
-    setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name
-    setting
+  def value
+    v = read_attribute(:value)
+    # Unserialize serialized settings
+    v = YAML::load(v) if @@available_settings[name]['serialized'] && v.is_a?(String)
+    v = v.to_sym if @@available_settings[name]['format'] == 'symbol' && !v.blank?
+    v
   end
   
+  def value=(v)
+    v = v.to_yaml if v && @@available_settings[name]['serialized']
+    write_attribute(:value, v.to_s)
+  end
+  
+  # Returns the value of the setting named name
   def self.[](name)
-    get(name).value
+    v = @cached_settings[name]
+    v ? v : (@cached_settings[name] = find_or_default(name).value)
   end
   
-  def self.[]=(name, value)
-    setting = get(name)
-    setting.value = (value ? value.to_s : "")
+  def self.[]=(name, v)
+    setting = find_or_default(name)
+    setting.value = (v ? v : "")
+    @cached_settings[name] = nil
     setting.save
     setting.value
   end
   
+  # Defines getter and setter for each setting
+  # Then setting values can be read using: Setting.some_setting_name
+  # or set using Setting.some_setting_name = "some value"
   @@available_settings.each do |name, params|
     src = <<-END_SRC
     def self.#{name}
@@ -49,7 +125,7 @@ class Setting < ActiveRecord::Base
     end
 
     def self.#{name}?
-      self[:#{name}].to_s == "1"
+      self[:#{name}].to_i > 0
     end
 
     def self.#{name}=(value)
@@ -58,4 +134,31 @@ class Setting < ActiveRecord::Base
     END_SRC
     class_eval src, __FILE__, __LINE__
   end
+  
+  # Helper that returns an array based on per_page_options setting
+  def self.per_page_options_array
+    per_page_options.split(%r{[\s,]}).collect(&:to_i).select {|n| n > 0}.sort
+  end
+  
+  # Checks if settings have changed since the values were read
+  # and clears the cache hash if it's the case
+  # Called once per request
+  def self.check_cache
+    settings_updated_on = Setting.maximum(:updated_on)
+    if settings_updated_on && @cached_cleared_on <= settings_updated_on
+      @cached_settings.clear
+      @cached_cleared_on = Time.now
+      logger.info "Settings cache cleared." if logger
+    end
+  end
+  
+private
+  # Returns the Setting instance for the setting named name
+  # (record found in database or new record with default value)
+  def self.find_or_default(name)
+    name = name.to_s
+    raise "There's no setting named #{name}" unless @@available_settings.has_key?(name)    
+    setting = find_by_name(name)
+    setting ||= new(:name => name, :value => @@available_settings[name]['default']) if @@available_settings.has_key? name
+  end
 end