tagged version 0.8.0

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

app/controllers/account_controller.rb

@@ -63,7 +63,6 @@ class AccountController < ApplicationController
           token = Token.create(:user => user, :action => 'autologin')
           cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
         end
-        call_hook(:controller_account_success_authentication_after, {:user => user })
         redirect_back_or_default :controller => 'my', :action => 'page'
       end
     end

app/controllers/admin_controller.rb

@@ -86,7 +86,6 @@ class AdminController < ApplicationController
     @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),
-      :plugin_assets_writable => File.writable?(Engines.public_directory),
       :rmagick_available => Object.const_defined?(:Magick)
     }
   end  

app/controllers/application.rb

@@ -175,7 +175,6 @@ class ApplicationController < ActionController::Base
   # TODO: move to model
   def attach_files(obj, attachments)
     attached = []
-    unsaved = []
     if attachments && attachments.is_a?(Hash)
       attachments.each_value do |attachment|
         file = attachment['file']
@@ -184,10 +183,7 @@ class ApplicationController < ActionController::Base
                               :file => file,
                               :description => attachment['description'].to_s.strip,
                               :author => User.current)
-        a.new_record? ? (unsaved << a) : (attached << a)
+        attached << a unless a.new_record?
-      end
-      if unsaved.any?
-        flash[:warning] = l(:warning_attachments_not_saved, unsaved.size)
       end
     end
     attached

app/controllers/attachments_controller.rb

@@ -1,5 +1,5 @@
-# Redmine - project management software
+# redMine - project management software
-# Copyright (C) 2006-2008  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
@@ -17,10 +17,6 @@
 
 class AttachmentsController < ApplicationController
   before_filter :find_project
-  before_filter :read_authorize, :except => :destroy
-  before_filter :delete_authorize, :only => :destroy
-  
-  verify :method => :post, :only => :destroy
 
   def show
     if @attachment.is_diff?
@@ -35,23 +31,12 @@ class AttachmentsController < ApplicationController
   end
   
   def download
-    if @attachment.container.is_a?(Version) || @attachment.container.is_a?(Project)
+    @attachment.increment_download if @attachment.container.is_a?(Version)
-      @attachment.increment_download
-    end
     
     # 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
-  
-  def destroy
-    # Make sure association callbacks are called
-    @attachment.container.attachments.delete(@attachment)
-    redirect_to :back
-  rescue ::ActionController::RedirectBackError
-    redirect_to :controller => 'projects', :action => 'show', :id => @project
   end
  
 private
@@ -59,16 +44,12 @@ private
     @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
-  
-  def read_authorize
-    @attachment.visible? ? true : deny_access
-  end
-  
-  def delete_authorize
-    @attachment.deletable? ? true : deny_access
-  end
 end

app/controllers/custom_fields_controller.rb

@@ -46,7 +46,6 @@ class CustomFieldsController < ApplicationController
     end  
     if request.post? and @custom_field.save
       flash[:notice] = l(:notice_successful_create)
-      call_hook(:controller_custom_fields_new_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'list', :tab => @custom_field.class.name
     end
     @trackers = Tracker.find(:all, :order => 'position')
@@ -59,7 +58,6 @@ class CustomFieldsController < ApplicationController
         @custom_field.trackers = params[:tracker_ids] ? Tracker.find(params[:tracker_ids]) : []
       end
       flash[:notice] = l(:notice_successful_update)
-      call_hook(:controller_custom_fields_edit_after_save, :params => params, :custom_field => @custom_field)
       redirect_to :action => 'list', :tab => @custom_field.class.name
     end
     @trackers = Tracker.find(:all, :order => 'position')

app/controllers/documents_controller.rb

@@ -72,6 +72,11 @@ class DocumentsController < ApplicationController
     redirect_to :action => 'show', :id => @document
   end
   
+  def destroy_attachment
+    @document.attachments.find(params[:attachment_id]).destroy
+    redirect_to :action => 'show', :id => @document
+  end
+
 private
   def find_project
     @project = Project.find(params[:project_id])

app/controllers/issues_controller.rb

@@ -18,18 +18,20 @@
 class IssuesController < ApplicationController
   menu_item :new_issue, :only => :new
   
-  before_filter :find_issue, :only => [:show, :edit, :reply]
+  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, :show, :changes
+  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
@@ -41,7 +43,6 @@ class IssuesController < ApplicationController
   include SortHelper
   include IssuesHelper
   helper :timelog
-  include Redmine::Export::PDF
 
   def index
     retrieve_query
@@ -67,7 +68,7 @@ class IssuesController < ApplicationController
         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(issues_to_pdf(@issues, @project), :type => 'application/pdf', :filename => 'export.pdf') }
+        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
@@ -105,7 +106,7 @@ class IssuesController < ApplicationController
     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(issue_to_pdf(@issue), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
+      format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
     end
   end
 
@@ -122,10 +123,7 @@ class IssuesController < ApplicationController
       render :nothing => true, :layout => true
       return
     end
-    if params[:issue].is_a?(Hash)
+    @issue.attributes = params[:issue]
-      @issue.attributes = params[:issue]
-      @issue.watcher_user_ids = params[:issue]['watcher_user_ids'] if User.current.allowed_to?(:add_issue_watchers, @project)
-    end
     @issue.author = User.current
     
     default_status = IssueStatus.default
@@ -147,8 +145,7 @@ class IssuesController < ApplicationController
         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(params[:continue] ? { :action => 'new', :tracker_id => @issue.tracker } :
+        redirect_to :controller => 'issues', :action => 'show', :id => @issue
-                                        { :action => 'show', :id => @issue })
         return
       end		
     end	
@@ -186,7 +183,7 @@ class IssuesController < ApplicationController
 
       if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
         # Log spend time
-        if User.current.allowed_to?(:log_time, @project)
+        if current_role.allowed_to?(:log_time)
           @time_entry.save
         end
         if !journal.new_record?
@@ -319,6 +316,17 @@ class IssuesController < ApplicationController
     redirect_to :action => 'index', :project_id => @project
   end
 
+  def destroy_attachment
+    a = @issue.attachments.find(params[:attachment_id])
+    a.destroy
+    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
@@ -343,12 +351,10 @@ class IssuesController < ApplicationController
       @gantt.events = events
     end
     
-    basename = (@project ? "#{@project.identifier}-" : '') + 'gantt'
-    
     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 => "#{basename}.png") } if @gantt.respond_to?('to_image')
+      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(gantt_to_pdf(@gantt, @project), :type => 'application/pdf', :filename => "#{basename}.pdf") }
+      format.pdf  { send_data(render(:template => "issues/gantt.rfpdf", :layout => false), :type => 'application/pdf', :filename => "#{@project.nil? ? '' : "#{@project.identifier}-" }gantt.pdf") }
     end
   end
   

app/controllers/messages_controller.rb

@@ -46,7 +46,6 @@ class MessagesController < ApplicationController
       @message.sticky = params[:message]['sticky']
     end
     if request.post? && @message.save
-      call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
       attach_files(@message, params[:attachments])
       redirect_to :action => 'show', :id => @message
     end
@@ -59,7 +58,6 @@ class MessagesController < ApplicationController
     @reply.board = @board
     @topic.children << @reply
     if !@reply.new_record?
-      call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
       attach_files(@reply, params[:attachments])
     end
     redirect_to :action => 'show', :id => @topic

app/controllers/news_controller.rb

@@ -65,7 +65,6 @@ class NewsController < ApplicationController
       flash[:notice] = l(:label_comment_added)
       redirect_to :action => 'show', :id => @news
     else
-      show
       render :action => 'show'
     end
   end

app/controllers/projects_controller.rb

@@ -33,6 +33,8 @@ class ProjectsController < ApplicationController
   include SortHelper
   helper :custom_fields
   include CustomFieldsHelper   
+  helper :ifpdf
+  include IfpdfHelper
   helper :issues
   helper IssuesHelper
   helper :queries
@@ -82,11 +84,6 @@ class ProjectsController < ApplicationController
 	
   # Show @project
   def show
-    if params[:jump]
-      # try to redirect to the requested menu item
-      redirect_to_project_menu_item(@project, params[:jump]) && return
-    end
-    
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
     @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")
@@ -191,13 +188,10 @@ class ProjectsController < ApplicationController
 
   def add_file
     if request.post?
-      container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
+      @version = @project.versions.find_by_id(params[:version_id])
-      attachments = attach_files(container, params[:attachments])
+      attachments = attach_files(@version, params[:attachments])
-      if !attachments.empty? && Setting.notified_events.include?('file_added')
+      Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
-        Mailer.deliver_attachments_added(attachments)
-      end
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
-      return
     end
     @versions = @project.versions.sort
   end
@@ -209,8 +203,7 @@ class ProjectsController < ApplicationController
                 'size' => "#{Attachment.table_name}.filesize",
                 'downloads' => "#{Attachment.table_name}.downloads"
                 
-    @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
+    @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
-    @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
     render :layout => !request.xhr?
   end
   

app/controllers/repositories_controller.rb

@@ -127,9 +127,6 @@ class RepositoriesController < ApplicationController
   end
   
   def annotate
-    @entry = @repository.entry(@path, @rev)
-    show_error_not_found and return unless @entry
-    
     @annotate = @repository.scm.annotate(@path, @rev)
     render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
   end

app/controllers/settings_controller.rb

@@ -40,7 +40,7 @@ class SettingsController < ApplicationController
     @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.dup
+    @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
 

app/controllers/timelog_controller.rb

@@ -197,9 +197,6 @@ class TimelogController < ApplicationController
     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]
-    
-    call_hook(:controller_timelog_edit_before_save, { :params => params, :time_entry => @time_entry })
-    
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
       redirect_back_or_default :action => 'details', :project_id => @time_entry.project

app/controllers/users_controller.rb

@@ -75,11 +75,7 @@ class UsersController < ApplicationController
       @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
-      @user.attributes = params[:user]
+      if @user.update_attributes(params[:user])
-      # Was the account actived ? (do it before User#save clears the change)
-      was_activated = (@user.status_change == [User::STATUS_REGISTERED, User::STATUS_ACTIVE])
-      if @user.save
-        Mailer.deliver_account_activated(@user) if was_activated
         flash[:notice] = l(:notice_successful_update)
         # 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]))

app/controllers/versions_controller.rb

@@ -37,6 +37,12 @@ class VersionsController < ApplicationController
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   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' }

app/controllers/wiki_controller.rb

@@ -21,7 +21,7 @@ class WikiController < ApplicationController
   before_filter :find_wiki, :authorize
   before_filter :find_existing_page, :only => [:rename, :protect, :history, :diff, :annotate, :add_attachment, :destroy]
   
-  verify :method => :post, :only => [:destroy, :protect], :redirect_to => { :action => :index }
+  verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
 
   helper :attachments
   include AttachmentsHelper   
@@ -82,7 +82,6 @@ class WikiController < ApplicationController
       @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)
-        call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
         redirect_to :action => 'index', :id => @project, :page => @page.title
       end
     end
@@ -182,6 +181,13 @@ class WikiController < ApplicationController
     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
   
   def find_wiki

app/helpers/application_helper.rb

@@ -148,15 +148,6 @@ module ApplicationHelper
     content
   end
 
-  # Renders flash messages
-  def render_flash_messages
-    s = ''
-    flash.each do |k,v|
-      s << content_tag('div', v, :class => "flash #{k}")
-    end
-    s
-  end
-
   # Truncates and returns the string as a single line
   def truncate_single_line(string, *args)
     truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
@@ -291,15 +282,16 @@ module ApplicationHelper
       attachments = attachments.sort_by(&:created_on).reverse
       text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(bmp|gif|jpg|jpeg|png))!/i) do |m|
         style = $1
-        filename = $6.downcase
+        filename = $6
+        rf = Regexp.new(Regexp.escape(filename),  Regexp::IGNORECASE)
         # search for the picture in attachments
-        if found = attachments.detect { |att| att.filename.downcase == filename }
+        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
-          m
+          "!#{style}#{filename}!"
         end
       end
     end
@@ -385,7 +377,7 @@ module ApplicationHelper
     #     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|
+    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?
@@ -487,11 +479,11 @@ module ApplicationHelper
       full_messages = []
       object.errors.each do |attr, msg|
         next if msg.nil?
-        msg = [msg] unless msg.is_a?(Array)
+        msg = msg.first if msg.is_a? Array
         if attr == "base"
-          full_messages << l(*msg)
+          full_messages << l(msg)
         else
-          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
+          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
         end
       end
       # retrieve custom values error messages
@@ -499,8 +491,8 @@ module ApplicationHelper
         object.custom_values.each do |v|
           v.errors.each do |attr, msg|
             next if msg.nil?
-            msg = [msg] unless msg.is_a?(Array)
+            msg = msg.first if msg.is_a? Array
-            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
+            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
           end
         end
       end
@@ -534,7 +526,6 @@ module ApplicationHelper
 
   def back_url_hidden_field_tag
     back_url = params[:back_url] || request.env['HTTP_REFERER']
-    back_url = CGI.unescape(back_url.to_s)
     hidden_field_tag('back_url', CGI.escape(back_url)) unless back_url.blank?
   end
 

app/helpers/attachments_helper.rb

@@ -16,15 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module AttachmentsHelper
-  # Displays view/delete links to the attachments of the given object
+  # displays the links to a collection of attachments
-  # Options:
+  def link_to_attachments(attachments, options = {})
-  #   :author -- author names are not displayed if set to false
+    if attachments.any?
-  def link_to_attachments(container, options = {})
+      render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
-    options.assert_valid_keys(:author)
-    
-    if container.attachments.any?
-      options = {:deletable => container.attachments_deletable?, :author => true}.merge(options)
-      render :partial => 'attachments/links', :locals => {:attachments => container.attachments, :options => options}
     end
   end
   

app/helpers/ifpdf_helper.rb

@@ -0,0 +1,85 @@
+# 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.
+
+require 'iconv'
+require 'rfpdf/chinese'
+
+module IfpdfHelper  
+  
+  class IFPDF < FPDF
+    include GLoc
+    attr_accessor :footer_date
+    
+    def initialize(lang)
+      super()
+      set_language_if_valid lang
+      case current_language.to_s
+      when 'ja'
+        extend(PDF_Japanese)
+        AddSJISFont()
+        @font_for_content = 'SJIS'
+        @font_for_footer = 'SJIS'
+      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'
+        @font_for_footer = 'Big5'
+      else
+        @font_for_content = 'Arial'
+        @font_for_footer = 'Helvetica'              
+      end
+      SetCreator(Redmine::Info.app_name)
+      SetFont(@font_for_content)
+    end
+    
+    def SetFontStyle(style, size)
+      SetFont(@font_for_content, style, size)
+    end
+      
+    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
+        # 0x5c char handling
+        txtar = txt.split('\\')
+        txtar << '' if txt[-1] == ?\\
+        txtar.collect {|x| @ic.iconv(x)}.join('\\').gsub(/\\/, "\\\\\\\\")
+      rescue
+        txt
+      end || ''
+      super w,h,txt,border,ln,align,fill,link
+    end
+    
+    def Footer
+      SetFont(@font_for_footer, 'I', 8)
+      SetY(-15)
+      SetX(15)
+      Cell(0, 5, @footer_date, 0, 0, 'L')
+      SetY(-15)
+      SetX(-30)
+      Cell(0, 5, PageNo().to_s + '/{nb}', 0, 0, 'C')
+    end
+    
+  end
+
+end

app/helpers/issues_helper.rb

@@ -36,10 +36,7 @@ module IssuesHelper
   # Returns a string of css classes that apply to the given issue
   def css_issue_classes(issue)
     s = "issue status-#{issue.status.position} priority-#{issue.priority.position}"
-    s << ' closed' if issue.closed?
     s << ' overdue' if issue.overdue?
-    s << ' created-by-me' if User.current.logged? && issue.author_id == User.current.id
-    s << ' assigned-to-me' if User.current.logged? && issue.assigned_to_id == User.current.id
     s
   end
   

app/helpers/queries_helper.rb

@@ -40,14 +40,8 @@ module QueriesHelper
       else
         case column.name
         when :subject
-        h((!@project.nil? && @project != issue.project) ? "#{issue.project.name} - " : '') +
+        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
           link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
-        when :project
-          link_to(h(value), :controller => 'projects', :action => 'show', :id => value)
-        when :assigned_to
-          link_to(h(value), :controller => 'account', :action => 'show', :id => value)
-        when :author
-          link_to(h(value), :controller => 'account', :action => 'show', :id => value)
         when :done_ratio
           progress_bar(value, :width => '80px')
         when :fixed_version

app/helpers/repositories_helper.rb

@@ -147,7 +147,7 @@ module RepositoriesHelper
 
   def subversion_field_tags(form, repository)
       content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
-                       '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
+                       '<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)),

app/helpers/timelog_helper.rb

@@ -16,8 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module TimelogHelper
-  include ApplicationHelper
-  
   def render_timelog_breadcrumb
     links = []
     links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
@@ -35,11 +33,7 @@ module TimelogHelper
   end
   
   def select_hours(data, criteria, value)
-  	if value.to_s.empty?
+    data.select {|row| row[criteria] == value}
-  		data.select {|row| row[criteria].blank? }
-    else 
-    	data.select {|row| row[criteria] == value}
-    end
   end
   
   def sum_hours(data)
@@ -87,7 +81,7 @@ module TimelogHelper
       csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       entries.each do |entry|
-        fields = [format_date(entry.spent_on),
+        fields = [l_date(entry.spent_on),
                   entry.user,
                   entry.activity,
                   entry.project,

app/helpers/wiki_helper.rb

@@ -36,7 +36,7 @@ module WikiHelper
           words_add += 1
         else
           del_at = pos unless del_at
-          deleted << ' ' + h(change[2])
+          deleted << ' ' + change[2]
           words_del	 += 1
         end
       end

app/models/attachment.rb

@@ -33,7 +33,7 @@ class Attachment < ActiveRecord::Base
                             :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 OR ( #{Attachment.table_name}.container_type='Project' AND #{Attachment.table_name}.container_id = #{Project.table_name}.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,
@@ -65,20 +65,14 @@ class Attachment < ActiveRecord::Base
     nil
   end
 
-  # Copies the temporary file to its final location
+  # Copy temp file to its final location
-  # and computes its MD5 hash
   def before_save
     if @temp_file && (@temp_file.size > 0)
       logger.debug("saving '#{self.diskfile}'")
-      md5 = Digest::MD5.new
       File.open(diskfile, "wb") do |f| 
-        buffer = ""
+        f.write(@temp_file.read)
-        while (buffer = @temp_file.read(8192))
-          f.write(buffer)
-          md5.update(buffer)
-        end
       end
-      self.digest = md5.hexdigest
+      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
@@ -104,14 +98,6 @@ class Attachment < ActiveRecord::Base
     container.project
   end
   
-  def visible?(user=User.current)
-    container.attachments_visible?(user)
-  end
-  
-  def deletable?(user=User.current)
-    container.attachments_deletable?(user)
-  end
-  
   def image?
     self.filename =~ /\.(jpe?g|gif|png)$/i
   end
@@ -147,4 +133,11 @@ private
     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/changeset.rb

@@ -112,8 +112,6 @@ class Changeset < ActiveRecord::Base
           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
-          Redmine::Hook.call_hook(:model_changeset_scan_commit_for_issue_ids_pre_issue_update,
-                                  { :changeset => self, :issue => issue })
           issue.save
           Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
         end

app/models/document.rb

@@ -18,7 +18,7 @@
 class Document < ActiveRecord::Base
   belongs_to :project
   belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
-  acts_as_attachable :delete_permission => :manage_documents
+  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}"},

app/models/issue.rb

@@ -26,13 +26,13 @@ class Issue < ActiveRecord::Base
   belongs_to :category, :class_name => 'IssueCategory', :foreign_key => 'category_id'
 
   has_many :journals, :as => :journalized, :dependent => :destroy
+  has_many :attachments, :as => :container, :dependent => :destroy
   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_attachable :after_remove => :attachment_removed
   acts_as_customizable
   acts_as_watchable
   acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
@@ -45,7 +45,7 @@ class Issue < ActiveRecord::Base
   acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]},
                             :author_key => :author_id
   
-  validates_presence_of :subject, :priority, :project, :tracker, :author, :status
+  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_numericality_of :estimated_hours, :allow_nil => true
@@ -266,15 +266,4 @@ class Issue < ActiveRecord::Base
   def to_s
     "#{tracker} ##{id}: #{subject}"
   end
-  
-  private
-  
-  # Callback on attachment deletion
-  def attachment_removed(obj)
-    journal = init_journal(User.current)
-    journal.details << JournalDetail.new(:property => 'attachment',
-                                         :prop_key => obj.id,
-                                         :old_value => obj.filename)
-    journal.save
-  end
 end

app/models/journal.rb

@@ -38,7 +38,7 @@ class Journal < ActiveRecord::Base
                                               :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
                                                              " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
   
-  def save(*args)
+  def save
     # Do not save an empty journal
     (details.empty? && notes.blank?) ? false : super
   end

app/models/mail_handler.rb

@@ -40,7 +40,7 @@ class MailHandler < ActionMailer::Base
   # Processes incoming emails
   def receive(email)
     @email = email
-    @user = User.active.find(:first, :conditions => ["LOWER(mail) = ?", email.from.to_a.first.to_s.strip.downcase])
+    @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
@@ -90,13 +90,6 @@ class MailHandler < ActionMailer::Base
     end
     issue.subject = email.subject.chomp.toutf8
     issue.description = plain_text_body
-    # custom fields
-    issue.custom_field_values = issue.available_custom_fields.inject({}) do |h, c|
-      if value = get_keyword(c.name, :override => true)
-        h[c.id] = value
-      end
-      h
-    end
     issue.save!
     add_attachments(issue)
     logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
@@ -162,18 +155,11 @@ class MailHandler < ActionMailer::Base
     end
   end
   
-  def get_keyword(attr, options={})
+  def get_keyword(attr)
-    @keywords ||= {}
+    if @@handler_options[:allow_override].include?(attr.to_s) && plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
-    if @keywords.has_key?(attr)
+      $1.strip
-      @keywords[attr]
+    elsif !@@handler_options[:issue][attr].blank?
-    else
+      @@handler_options[:issue][attr]
-      @keywords[attr] = begin
-        if (options[:override] || @@handler_options[:allow_override].include?(attr.to_s)) && plain_text_body.gsub!(/^#{attr}[ \t]*:[ \t]*(.+)\s*$/i, '')
-          $1.strip
-        elsif !@@handler_options[:issue][attr].blank?
-          @@handler_options[:issue][attr]
-        end
-      end
     end
   end
   
@@ -195,6 +181,5 @@ class MailHandler < ActionMailer::Base
       @plain_text_body = plain_text_part.body.to_s
     end
     @plain_text_body.strip!
-    @plain_text_body
   end
 end

app/models/mailer.rb

@@ -22,19 +22,12 @@ class Mailer < ActionMailer::Base
 
   include ActionController::UrlWriter
 
-  def self.default_url_options
-    h = Setting.host_name
-    h = h.to_s.gsub(%r{\/.*$}, '') unless Redmine::Utils.relative_url_root.blank?
-    { :host => h, :protocol => Setting.protocol }
-  end
-  
   def issue_add(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
-    cc(issue.watcher_recipients - @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)
@@ -46,7 +39,6 @@ class Mailer < ActionMailer::Base
                     'Issue-Id' => issue.id,
                     'Issue-Author' => issue.author.login
     redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
-    @author = journal.user
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)
@@ -81,9 +73,6 @@ class Mailer < ActionMailer::Base
     added_to = ''
     added_to_url = ''
     case container.class.name
-    when 'Project'
-      added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container)
-      added_to = "#{l(:label_project)}: #{container}"
     when 'Version'
       added_to_url = url_for(:controller => 'projects', :action => 'list_files', :id => container.project_id)
       added_to = "#{l(:label_version)}: #{container.name}"
@@ -133,15 +122,6 @@ class Mailer < ActionMailer::Base
          :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
   end
 
-  # A registered user's account was activated by an administrator
-  def account_activated(user)
-    set_language_if_valid user.language
-    recipients user.mail
-    subject l(:mail_subject_register, Setting.app_title)
-    body :user => user,
-         :login_url => url_for(:controller => 'account', :action => 'login')
-  end
-
   def lost_password(token)
     set_language_if_valid(token.user.language)
     recipients token.user.mail
@@ -204,12 +184,16 @@ class Mailer < ActionMailer::Base
     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,
+            'X-Redmine-Site' => Setting.app_title
-            'Precedence' => 'bulk',
-            'Auto-Submitted' => 'auto-generated'
   end
 
   # Appends a Redmine header field (name is prepended with 'X-Redmine-')
@@ -221,10 +205,9 @@ class Mailer < ActionMailer::Base
   def create_mail
     # Removes the current user from the recipients and cc
     # if he doesn't want to receive notifications about what he does
-    @author ||= User.current
+    if User.current.pref[:no_self_notified]
-    if @author.pref[:no_self_notified]
+      recipients.delete(User.current.mail) if recipients
-      recipients.delete(@author.mail) if recipients
+      cc.delete(User.current.mail) if cc
-      cc.delete(@author.mail) if cc
     end
     # Blind carbon copy recipients
     if Setting.bcc_recipients?

app/models/message.rb

@@ -19,11 +19,11 @@ 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"
-  acts_as_attachable
+  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},
+                     :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}"},

app/models/news.rb

@@ -24,7 +24,7 @@ class News < ActiveRecord::Base
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
 
-  acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"], :include => :project
+  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

app/models/project.rb

@@ -44,8 +44,6 @@ class Project < ActiveRecord::Base
                           :association_foreign_key => 'custom_field_id'
                           
   acts_as_tree :order => "name", :counter_cache => true
-  acts_as_attachable :view_permission => :view_files,
-                     :delete_permission => :manage_files
 
   acts_as_customizable
   acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
@@ -60,7 +58,7 @@ class Project < ActiveRecord::Base
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
   validates_length_of :homepage, :maximum => 255
-  validates_length_of :identifier, :in => 1..20
+  validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
   before_destroy :delete_all_members

app/models/query.rb

@@ -93,7 +93,6 @@ class Query < ActiveRecord::Base
   cattr_reader :operators_by_filter_type
 
   @@available_columns = [
-    QueryColumn.new(:project, :sortable => "#{Project.table_name}.name"),
     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'),
@@ -235,10 +234,7 @@ class Query < ActiveRecord::Base
   
   def columns
     if has_default_columns?
-      available_columns.select do |c|
+      available_columns.select {|c| Setting.issue_list_default_columns.include?(c.name.to_s) }
-        # Adds the project column by default for cross-project lists
-        Setting.issue_list_default_columns.include?(c.name.to_s) || (c.name == :project && project.nil?)
-      end
     else
       # preserve the column_names order
       column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
@@ -368,9 +364,9 @@ class Query < ActiveRecord::Base
         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 = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+      sql = "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(value.first)}%'"
     when "!~"
-      sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
+      sql = "#{db_table}.#{db_field} NOT LIKE '%#{connection.quote_string(value.first)}%'"
     end
     
     return sql

app/models/repository/subversion.rb

@@ -20,7 +20,7 @@ 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(\+[^\s:\/\\]+)?|file):\/\/.+/i
+  validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i
 
   def scm_adapter
     Redmine::Scm::Adapters::SubversionAdapter
@@ -54,8 +54,8 @@ class Repository::Subversion < Repository
           # loads changesets by batches of 200
           identifier_to = [identifier_from + 199, scm_revision].min
           revisions = scm.revisions('', identifier_to, identifier_from, :with_paths => true)
-          revisions.reverse_each do |revision|
+          transaction do
-            transaction do
+            revisions.reverse_each do |revision|
               changeset = Changeset.create(:repository => self,
                                            :revision => revision.identifier, 
                                            :committer => revision.author, 
@@ -68,7 +68,7 @@ class Repository::Subversion < Repository
                               :path => change[:path],
                               :from_path => change[:from_path],
                               :from_revision => change[:from_revision])
-              end unless changeset.new_record?
+              end
             end
           end unless revisions.nil?
           identifier_from = identifier_to + 1

app/models/role.rb

@@ -31,9 +31,9 @@ class Role < ActiveRecord::Base
       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 #{Workflow.table_name} (tracker_id, old_status_id, new_status_id, role_id)" +
+      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 #{Workflow.table_name}" +
+                        " FROM workflows" +
                         " WHERE role_id = #{role.id}"
     end
   end

app/models/time_entry.rb

@@ -32,7 +32,7 @@ class TimeEntry < ActiveRecord::Base
                 :description => :comments
   
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
-  validates_numericality_of :hours, :allow_nil => true, :message => :activerecord_error_invalid
+  validates_numericality_of :hours, :allow_nil => true
   validates_length_of :comments, :maximum => 255, :allow_nil => true
 
   def after_initialize
@@ -54,7 +54,7 @@ class TimeEntry < ActiveRecord::Base
   end
   
   def hours=(h)
-    write_attribute :hours, (h.is_a?(String) ? (h.to_hours || h) : h)
+    write_attribute :hours, (h.is_a?(String) ? h.to_hours : h)
   end
   
   # tyear, tmonth, tweek assigned where setting spent_on attributes

app/models/token.rb

@@ -15,11 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'rails_generator/secret_key_generator'
-
 class Token < ActiveRecord::Base
   belongs_to :user
-  validates_uniqueness_of :value
   
   @@validity_time = 1.day
   
@@ -39,7 +36,9 @@ class Token < ActiveRecord::Base
   
 private
   def self.generate_token_value
-    s = Rails::SecretKeyGenerator.new(object_id).generate_secret
+    chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
-    s[0, 40]
+    token_value = ''
+    40.times { |i| token_value << chars[rand(chars.size-1)] }
+    token_value
   end
 end

app/models/tracker.rb

@@ -23,9 +23,9 @@ class Tracker < ActiveRecord::Base
       raise "Can not copy workflow from a #{tracker.class}" unless tracker.is_a?(Tracker)
       raise "Can not copy workflow from/to an unsaved tracker" if proxy_owner.new_record? || tracker.new_record?
       clear
-      connection.insert "INSERT INTO #{Workflow.table_name} (tracker_id, old_status_id, new_status_id, role_id)" +
+      connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
                         " SELECT #{proxy_owner.id}, old_status_id, new_status_id, role_id" +
-                        " FROM #{Workflow.table_name}" +
+                        " FROM workflows" +
                         " WHERE tracker_id = #{tracker.id}"
     end
   end

app/models/user.rb

@@ -175,14 +175,8 @@ class User < ActiveRecord::Base
   end
   
   def self.find_by_autologin_key(key)
-    tokens = Token.find_all_by_action_and_value('autologin', key)
+    token = Token.find_by_action_and_value('autologin', key)
-    # Make sure there's only 1 token that matches the key
+    token && (token.created_on > Setting.autologin.to_i.day.ago) && token.user.active? ? token.user : nil
-    if tokens.size == 1
-      token = tokens.first
-      if (token.created_on > Setting.autologin.to_i.day.ago) && token.user && token.user.active?
-        token.user
-      end
-    end
   end
   
   # Makes find_by_mail case-insensitive

app/models/version.rb

@@ -19,8 +19,7 @@ class Version < ActiveRecord::Base
   before_destroy :check_integrity
   belongs_to :project
   has_many :fixed_issues, :class_name => 'Issue', :foreign_key => 'fixed_version_id'
-  acts_as_attachable :view_permission => :view_files,
+  has_many :attachments, :as => :container, :dependent => :destroy
-                     :delete_permission => :manage_files
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]

app/models/wiki_content.rb

@@ -22,7 +22,6 @@ class WikiContent < ActiveRecord::Base
   belongs_to :page, :class_name => 'WikiPage', :foreign_key => 'page_id'
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   validates_presence_of :text
-  validates_length_of :comments, :maximum => 255, :allow_nil => true
   
   acts_as_versioned
   class Version

app/models/wiki_page.rb

@@ -21,7 +21,7 @@ require 'enumerator'
 class WikiPage < ActiveRecord::Base
   belongs_to :wiki
   has_one :content, :class_name => 'WikiContent', :foreign_key => 'page_id', :dependent => :destroy
-  acts_as_attachable :delete_permission => :delete_wiki_pages_attachments
+  has_many :attachments, :as => :container, :dependent => :destroy
   acts_as_tree :order => 'title'
   
   acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
@@ -112,10 +112,6 @@ class WikiPage < ActiveRecord::Base
     !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
   end
   
-  def attachments_deletable?(usr=User.current)
-    editable_by?(usr) && super(usr)
-  end
-  
   def parent_title
     @parent_title || (self.parent && self.parent.pretty_title)
   end

app/views/account/show.rhtml

@@ -29,7 +29,6 @@
 <% end %>
 </ul>
 <% end %>
-<%= call_hook :view_account_left_bottom, :user => @user %>
 </div>
 
 <div class="splitcontentright">
@@ -65,7 +64,6 @@
 		<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :user_id => @user, :format => :atom, :key => User.current.rss_key) %>
 <% end %>
 <% end %>
-<%= call_hook :view_account_right_bottom, :user => @user %>
 </div>
 
 <% html_title @user.name %>

app/views/admin/info.rhtml

@@ -4,8 +4,7 @@
 
 <table class="list">
 <tr class="odd"><td><%= l(:text_default_administrator_account_changed) %></td><td><%= image_tag (@flags[:default_admin_changed] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
-<tr class="even"><td><%= l(:text_file_repository_writable) %> (<%= Attachment.storage_path %>)</td><td><%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+<tr class="even"><td><%= l(:text_file_repository_writable) %></td><td><%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
-<tr class="even"><td><%= l(:text_plugin_assets_writable) %> (<%= Engines.public_directory %>)</td><td><%= image_tag (@flags[:plugin_assets_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
 <tr class="odd"><td><%= l(:text_rmagick_available) %></td><td><%= image_tag (@flags[:rmagick_available] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
 </table>
 

app/views/attachments/_links.rhtml

@@ -3,14 +3,14 @@
 <p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
 <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
-  <% if options[:deletable] %>
+  <% if options[:delete_url] %>
-    <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => attachment},
+    <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}),
                                          :confirm => l(:text_are_you_sure),
                                          :method => :post,
                                          :class => 'delete',
                                          :title => l(:button_delete) %>
   <% end %>
-  <% if options[:author] %>
+  <% unless options[:no_author] %>
     <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
   <% end %>
   </p>

app/views/common/_calendar.rhtml

@@ -11,7 +11,7 @@ while day <= calendar.enddt %>
 <p class="day-num"><%= day.day %></p>	
 <% calendar.events_on(day).each do |i| %>
   <% if i.is_a? Issue %>
-  <div class="<%= css_issue_classes(i) %> tooltip">
+  <div class="tooltip">
   <%= if day == i.start_date && day == i.due_date
         image_tag('arrow_bw.png')
       elsif day == i.start_date

app/views/common/_file.rhtml

@@ -3,7 +3,7 @@
 <tbody>
 <% line_num = 1 %>
 <% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
-<tr><th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th><td class="line-code"><pre><%= line %></pre></td></tr>
+<tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
 <% line_num += 1 %>
 <% end %>
 </tbody>

app/views/common/feed.atom.rxml

@@ -1,8 +1,8 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   xml.title   truncate_single_line(@title, 100)
-  xml.link    "rel" => "self", "href" => url_for(params.merge(:only_path => false))
+  xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
-  xml.link    "rel" => "alternate", "href" => url_for(params.merge(:only_path => false, :format => nil, :key => nil))
+  xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
   xml.id      url_for(:controller => 'welcome', :only_path => false)
   xml.updated((@items.first ? @items.first.event_datetime : Time.now).xmlschema)
   xml.author  { xml.name "#{Setting.app_title}" }
@@ -21,10 +21,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       author = item.event_author if item.respond_to?(:event_author)
       xml.author do
         xml.name(author)
-        xml.email(author.mail) if author.is_a?(User) && !author.mail.blank? && !author.pref.hide_mail
+        xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
       end if author
       xml.content "type" => "html" do
-        xml.text! textilizable(item, :event_description, :only_path => false)
+        xml.text! textilizable(item.event_description)
       end
     end
   end

app/views/custom_fields/_form.rhtml

@@ -82,7 +82,6 @@ function deleteValueField(e) {
 <% end %>
 </p>
 <p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
-<%= call_hook(:view_custom_fields_form_upper_box, :custom_field => @custom_field, :form => f) %>
 </div>
 
 <div class="box">
@@ -110,6 +109,5 @@ when "IssueCustomField" %>
     <p><%= f.check_box :is_required %></p>
 
 <% end %>
-<%= call_hook(:"view_custom_fields_form_#{@custom_field.type.to_s.underscore}", :custom_field => @custom_field, :form => f) %>
 </div>
 <%= javascript_tag "toggle_custom_field_format();" %>

app/views/documents/show.rhtml

@@ -12,7 +12,7 @@
 </div>
 
 <h3><%= l(:label_attachment_plural) %></h3>
-<%= link_to_attachments @document %>
+<%= link_to_attachments @attachments, :delete_url => (authorize_for('documents', 'destroy_attachment') ? {:controller => 'documents', :action => 'destroy_attachment', :id => @document} : nil) %>
 
 <% if authorize_for('documents', 'add_attachment') %>
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",

app/views/issue_statuses/_form.rhtml

@@ -11,7 +11,5 @@
 <p><label for="issue_status_is_default"><%=l(:field_is_default)%></label>
 <%= check_box 'issue_status', 'is_default' %></p>
 
-<%= call_hook(:view_issue_statuses_form, :issue_status => @issue_status) %>
-
 <!--[eoform:issue_status]-->
 </div>

app/views/issues/_form.rhtml

@@ -8,7 +8,7 @@
 
 <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
-<p><%= f.text_area :description,
+<p><%= f.text_area :description, :required => true,
                    :cols => 60,
                    :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                    :accesskey => accesskey(:edit),
@@ -24,13 +24,11 @@
 
 <p><%= f.select :priority_id, (@priorities.collect {|p| [p.name, p.id]}), :required => true %></p>
 <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
-<% unless @project.issue_categories.empty? %>
 <p><%= f.select :category_id, (@project.issue_categories.collect {|c| [c.name, c.id]}), :include_blank => true %>
 <%= prompt_to_remote(l(:label_issue_category_new),
                      l(:label_issue_category_new), 'category[name]', 
                      {:controller => 'projects', :action => 'add_issue_category', :id => @project},
                      :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
-<% end %>
 <%= content_tag('p', f.select(:fixed_version_id, 
                               (@project.versions.sort.collect {|v| [v.name, v.id]}),
                               { :include_blank => true })) unless @project.versions.empty? %>
@@ -50,14 +48,6 @@
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 <% end %>
 
-<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
-<p><label><%= l(:label_issue_watchers) %></label>
-<% @issue.project.users.sort.each do |user| -%>
-<label class="floating"><%= check_box_tag 'issue[watcher_user_ids][]', user.id, @issue.watcher_user_ids.include?(user.id) %> <%=h user %></label>
-<% end -%>
-</p>
-<% end %>
-
 <%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
 
 <%= wikitoolbar_for 'issue_description' %>

app/views/issues/_sidebar.rhtml

@@ -7,8 +7,8 @@
 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
 
 <% planning_links = []
-  planning_links << link_to(l(:label_calendar), :controller => 'issues', :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
+  planning_links << link_to(l(:label_calendar), :action => 'calendar', :project_id => @project) if User.current.allowed_to?(:view_calendar, @project, :global => true)
-  planning_links << link_to(l(:label_gantt), :controller => 'issues', :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
+  planning_links << link_to(l(:label_gantt), :action => 'gantt', :project_id => @project) if User.current.allowed_to?(:view_gantt, @project, :global => true)
 %>
 <% unless planning_links.empty? %>
 <h3><%= l(:label_planning) %></h3>

app/views/issues/bulk_edit.rhtml

@@ -44,7 +44,6 @@
 <fieldset><legend><%= l(:field_notes) %></legend>
 <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
 <%= wikitoolbar_for 'notes' %>
-</fieldset>
 </div>
 
 <p><%= submit_tag l(:button_submit) %>

app/views/issues/changes.rxml

@@ -15,7 +15,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.updated change.created_on.xmlschema
       xml.author do
         xml.name change.user.name
-        xml.email(change.user.mail) if change.user.is_a?(User) && !change.user.mail.blank? && !change.user.pref.hide_mail
+        xml.email(change.user.mail)
       end
       xml.content "type" => "html" do
         xml.text! '<ul>'
@@ -23,7 +23,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
           xml.text! '<li>' + show_detail(detail, false) + '</li>'
         end
         xml.text! '</ul>'
-        xml.text! textilizable(change, :notes, :only_path => false) unless change.notes.blank?
+        xml.text! textilizable(change.notes) unless change.notes.blank?
       end
     end
   end

app/views/issues/context_menu.rhtml

@@ -1,6 +1,4 @@
 <ul>
-  <%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
-
 <% if !@issue.nil? -%>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
@@ -89,6 +87,4 @@
 	                        :class => 'icon-move', :disabled => !@can[:move]  %></li>
   <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
                             :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
-
-  <%= call_hook(:view_issues_context_menu_end, {:issues => @issues, :can => @can, :back => @back }) %>
 </ul>

app/views/issues/gantt.rfpdf

@@ -0,0 +1,188 @@
+<%
+pdf=IfpdfHelper::IFPDF.new(current_language)
+pdf.SetTitle("#{l(:label_gantt)} #{@project}")
+pdf.AliasNbPages
+pdf.footer_date = format_date(Date.today)
+pdf.AddPage("L")
+pdf.SetFontStyle('B',12)
+pdf.SetX(15)
+pdf.Cell(70, 20, @project.to_s)
+pdf.Ln
+pdf.SetFontStyle('B',9)
+
+subject_width = 70
+header_heigth = 5
+
+headers_heigth = header_heigth
+show_weeks = false
+show_days = false
+
+if @gantt.months < 7
+    show_weeks = true
+    headers_heigth = 2*header_heigth
+    if @gantt.months < 3
+        show_days = true
+        headers_heigth = 3*header_heigth
+    end
+end
+
+g_width = 210
+zoom = (g_width) / (@gantt.date_to - @gantt.date_from + 1)
+g_height = 120
+t_height = g_height + headers_heigth
+
+y_start = pdf.GetY
+
+
+#
+# Months headers
+#
+month_f = @gantt.date_from
+left = subject_width
+height = header_heigth
+@gantt.months.times do 
+	width = ((month_f >> 1) - month_f) * zoom 
+	pdf.SetY(y_start)
+	pdf.SetX(left)
+	pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
+	left = left + width
+	month_f = month_f >> 1
+end  
+
+#
+# Weeks headers
+#
+if show_weeks
+	left = subject_width
+	height = header_heigth
+	if @gantt.date_from.cwday == 1
+	    # @gantt.date_from is monday
+        week_f = @gantt.date_from
+	else
+	    # find next monday after @gantt.date_from
+		week_f = @gantt.date_from + (7 - @gantt.date_from.cwday + 1)
+		width = (7 - @gantt.date_from.cwday + 1) * zoom-1
+		pdf.SetY(y_start + header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width + 1, height, "", "LTR")
+		left = left + width+1
+	end
+	while week_f <= @gantt.date_to
+		width = (week_f + 6 <= @gantt.date_to) ? 7 * zoom : (@gantt.date_to - week_f + 1) * zoom
+		pdf.SetY(y_start + header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
+		left = left + width
+		week_f = week_f+7
+	end
+end
+
+#
+# Days headers
+#
+if show_days
+	left = subject_width
+	height = header_heigth
+	wday = @gantt.date_from.cwday
+	pdf.SetFontStyle('B',7)
+	(@gantt.date_to - @gantt.date_from + 1).to_i.times do 
+		width = zoom
+		pdf.SetY(y_start + 2 * header_heigth)
+		pdf.SetX(left)
+		pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
+		left = left + width
+		wday = wday + 1
+		wday = 1 if wday > 7
+	end
+end
+
+pdf.SetY(y_start)
+pdf.SetX(15)
+pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
+
+
+#
+# Tasks
+#
+top = headers_heigth + y_start
+pdf.SetFontStyle('B',7)
+@gantt.events.each do |i|
+	pdf.SetY(top)
+	pdf.SetX(15)
+	
+	if i.is_a? Issue
+		pdf.Cell(subject_width-15, 5, "#{i.tracker.name} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
+	else
+		pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
+	end
+
+	pdf.SetY(top)
+	pdf.SetX(subject_width)
+	pdf.Cell(g_width, 5, "", "LR")
+
+	pdf.SetY(top+1.5)
+	
+	if i.is_a? Issue
+		i_start_date = (i.start_date >= @gantt.date_from ? i.start_date : @gantt.date_from )
+		i_end_date = (i.due_before <= @gantt.date_to ? i.due_before : @gantt.date_to )
+		
+		i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
+		i_done_date = (i_done_date <= @gantt.date_from ? @gantt.date_from : i_done_date )
+		i_done_date = (i_done_date >= @gantt.date_to ? @gantt.date_to : i_done_date )
+		
+		i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+		
+		i_left = ((i_start_date - @gantt.date_from)*zoom) 
+		i_width = ((i_end_date - i_start_date + 1)*zoom)
+		d_width = ((i_done_date - i_start_date)*zoom)
+		l_width = ((i_late_date - i_start_date+1)*zoom) if i_late_date
+		l_width ||= 0
+	
+		pdf.SetX(subject_width + i_left)
+		pdf.SetFillColor(200,200,200)
+		pdf.Cell(i_width, 2, "", 0, 0, "", 1)
+	
+		if l_width > 0
+			pdf.SetY(top+1.5)
+			pdf.SetX(subject_width + i_left)
+			pdf.SetFillColor(255,100,100)
+			pdf.Cell(l_width, 2, "", 0, 0, "", 1)
+		end 
+		if d_width > 0
+			pdf.SetY(top+1.5)
+			pdf.SetX(subject_width + i_left)
+			pdf.SetFillColor(100,100,255)
+			pdf.Cell(d_width, 2, "", 0, 0, "", 1)
+		end
+		
+		pdf.SetY(top+1.5)
+		pdf.SetX(subject_width + i_left + i_width)
+		pdf.Cell(30, 2, "#{i.status.name} #{i.done_ratio}%")
+	else
+		i_left = ((i.start_date - @gantt.date_from)*zoom) 
+		
+		pdf.SetX(subject_width + i_left)
+		pdf.SetFillColor(50,200,50)
+		pdf.Cell(2, 2, "", 0, 0, "", 1)	
+
+		pdf.SetY(top+1.5)
+		pdf.SetX(subject_width + i_left + 3)
+		pdf.Cell(30, 2, "#{i.name}")
+	end
+	
+	
+	top = top + 5
+	pdf.SetDrawColor(200, 200, 200)
+	pdf.Line(15, top, subject_width+g_width, top)
+	if pdf.GetY() > 180
+		pdf.AddPage("L")
+		top = 20
+		pdf.Line(15, top, subject_width+g_width, top)
+	end
+	pdf.SetDrawColor(0, 0, 0)
+end
+
+pdf.Line(15, top, subject_width+g_width, top)
+
+%>
+<%= pdf.Output %>

app/views/issues/index.rfpdf

@@ -0,0 +1,50 @@
+<%	pdf=IfpdfHelper::IFPDF.new(current_language)
+	title = @project ? "#{@project.name} - #{l(:label_issue_plural)}" : "#{l(:label_issue_plural)}"
+	pdf.SetTitle(title)
+	pdf.AliasNbPages
+	pdf.footer_date = format_date(Date.today)
+	pdf.AddPage("L")
+	row_height = 7
+	
+	#
+	# title
+	#
+	pdf.SetFontStyle('B',11)   	
+   	pdf.Cell(190,10, title)
+    pdf.Ln
+	
+	#
+	# headers
+	#	
+	pdf.SetFontStyle('B',10)
+	pdf.SetFillColor(230, 230, 230)
+   	pdf.Cell(15, row_height, "#", 0, 0, 'L', 1)
+   	pdf.Cell(30, row_height, l(:field_tracker), 0, 0, 'L', 1)
+   	pdf.Cell(30, row_height, l(:field_status), 0, 0, 'L', 1)
+   	pdf.Cell(30, row_height, l(:field_priority), 0, 0, 'L', 1)
+   	pdf.Cell(40, row_height, l(:field_assigned_to), 0, 0, 'L', 1)
+   	pdf.Cell(25, row_height, l(:field_updated_on), 0, 0, 'L', 1)
+   	pdf.Cell(0, row_height, l(:field_subject), 0, 0, 'L', 1)
+   	pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+   	pdf.Ln
+   	pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+   	pdf.SetY(pdf.GetY() + 1)
+	
+	#
+	# rows
+	#
+	pdf.SetFontStyle('',9)
+	pdf.SetFillColor(255, 255, 255)
+	@issues.each do |issue|		
+	   	pdf.Cell(15, row_height, issue.id.to_s, 0, 0, 'L', 1)
+	   	pdf.Cell(30, row_height, issue.tracker.name, 0, 0, 'L', 1)
+	   	pdf.Cell(30, row_height, issue.status.name, 0, 0, 'L', 1)
+	   	pdf.Cell(30, row_height, issue.priority.name, 0, 0, 'L', 1)
+	   	pdf.Cell(40, row_height, issue.assigned_to ? issue.assigned_to.name : '', 0, 0, 'L', 1)
+	   	pdf.Cell(25, row_height, format_date(issue.updated_on), 0, 0, 'L', 1)
+	   	pdf.MultiCell(0, row_height, (@project == issue.project ? issue.subject : "#{issue.project.name} - #{issue.subject}"))
+   		pdf.Line(10, pdf.GetY, 287, pdf.GetY)
+   		pdf.SetY(pdf.GetY() + 1)
+	end
+%>
+<%= pdf.Output %>

app/views/issues/index.rhtml

@@ -42,7 +42,6 @@
 <% else %>
 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
 <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
-<% end %>
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
@@ -51,6 +50,7 @@
 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
 </p>
 <% end %>
+<% end %>
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>

app/views/issues/new.rhtml

@@ -7,7 +7,6 @@
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
     </div>
     <%= submit_tag l(:button_create) %>
-    <%= submit_tag l(:button_create_and_continue), :name => 'continue' %>
     <%= link_to_remote l(:label_preview), 
                        { :url => { :controller => 'issues', :action => 'preview', :project_id => @project },
                          :method => 'post',
@@ -15,12 +14,6 @@
                          :with => "Form.serialize('issue-form')",
                          :complete => "Element.scrollTo('preview')"
                        }, :accesskey => accesskey(:preview) %>
-											 
-		<%= javascript_tag "Form.Element.focus('issue_subject');" %>
 <% end %>
 
 <div id="preview" class="wiki"></div>
-
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>

app/views/issues/show.rfpdf

@@ -0,0 +1,126 @@
+<%	pdf=IfpdfHelper::IFPDF.new(current_language)
+	pdf.SetTitle("#{@project.name} - ##{@issue.tracker.name} #{@issue.id}")
+	pdf.AliasNbPages
+	pdf.footer_date = format_date(Date.today)
+	pdf.AddPage
+	
+  	pdf.SetFontStyle('B',11)   	
+   	pdf.Cell(190,10, "#{@issue.project} - #{@issue.tracker} # #{@issue.id}: #{@issue.subject}")
+    pdf.Ln
+    
+    y0 = pdf.GetY
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_status) + ":","LT")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.status.name,"RT")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_priority) + ":","LT")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.priority.name,"RT")        
+    pdf.Ln
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_author) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.author.name,"R")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_category) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, (@issue.category ? @issue.category.name : "-"),"R")
+    pdf.Ln   
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_created_on) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.created_on),"R")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, (@issue.assigned_to ? @issue.assigned_to.name : "-"),"R")
+    pdf.Ln
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.updated_on),"RB")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_due_date) + ":","LB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.due_date),"RB")
+    pdf.Ln
+    
+	for custom_value in @issue.custom_values
+	    pdf.SetFontStyle('B',9)
+	    pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
+	    pdf.SetFontStyle('',9)
+	    pdf.MultiCell(155,5, (show_value custom_value),"R")
+	end
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_subject) + ":","LTB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(155,5, @issue.subject,"RTB")
+    pdf.Ln    
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_description) + ":")
+    pdf.SetFontStyle('',9)
+    pdf.MultiCell(155,5, @issue.description,"BR")
+    
+    pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
+	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
+
+    pdf.Ln
+    
+    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @issue.project)
+    	pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_associated_revisions), "B")
+	    pdf.Ln	
+		for changeset in @issue.changesets
+			pdf.SetFontStyle('B',8)
+		    pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.author.to_s)
+		    pdf.Ln
+			unless changeset.comments.blank?
+				pdf.SetFontStyle('',8)
+				pdf.MultiCell(190,5, changeset.comments)
+			end		
+			pdf.Ln
+		end
+	end
+	
+	pdf.SetFontStyle('B',9)
+    pdf.Cell(190,5, l(:label_history), "B")
+    pdf.Ln	
+	for journal in @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+		pdf.SetFontStyle('B',8)
+	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
+	    pdf.Ln
+		pdf.SetFontStyle('I',8)
+		for detail in journal.details
+			pdf.Cell(190,5, "- " + show_detail(detail, true))
+			pdf.Ln
+		end
+		if journal.notes?
+			pdf.SetFontStyle('',8)
+			pdf.MultiCell(190,5, journal.notes)
+		end		
+		pdf.Ln
+	end
+	
+	if @issue.attachments.any?
+	    pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_attachment_plural), "B")
+		pdf.Ln
+		for attachment in @issue.attachments
+			pdf.SetFontStyle('',8)
+		    pdf.Cell(80,5, attachment.filename)
+			pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+			pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
+			pdf.Cell(65,5, attachment.author.name,0,0,"R")
+			pdf.Ln
+		end
+	end
+%>
+
+<%= pdf.Output %>

app/views/issues/show.rhtml

@@ -9,7 +9,7 @@
 
 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
 
-<div class="<%= css_issue_classes(@issue) %> details">
+<div class="<%= css_issue_classes(@issue) %>">
         <%= avatar(@issue.author, :size => "64") %>
         <h3><%=h @issue.subject %></h3>
         <p class="author">
@@ -19,11 +19,11 @@
 
 <table width="100%">
 <tr>
-    <td style="width:15%" class="status"><b><%=l(:field_status)%>:</b></td><td style="width:35%" class="status"><%= @issue.status.name %></td>
+    <td style="width:15%" class="status"><b><%=l(:field_status)%>:</b></td><td style="width:35%" class="status status-<%= @issue.status.name %>"><%= @issue.status.name %></td>
     <td style="width:15%" class="start-date"><b><%=l(:field_start_date)%>:</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
 </tr>
 <tr>
-    <td class="priority"><b><%=l(:field_priority)%>:</b></td><td class="priority"><%= @issue.priority.name %></td>
+    <td class="priority"><b><%=l(:field_priority)%>:</b></td><td class="priority priority-<%= @issue.priority.name %>"><%= @issue.priority.name %></td>
     <td class="due-date"><b><%=l(:field_due_date)%>:</b></td><td class="due-date"><%= format_date(@issue.due_date) %></td>
 </tr>
 <tr>
@@ -45,7 +45,7 @@
 </tr>
 <tr>
 <% n = 0 -%>
-<% @issue.custom_field_values.each do |value| -%>
+<% @issue.custom_values.each do |value| -%>
     <td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td>
 <% n = n + 1
    if (n > 1) 
@@ -59,7 +59,7 @@ end %>
 <hr />
 
 <div class="contextual">
-<%= link_to_remote_if_authorized(l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment') unless @issue.description.blank? %>
+<%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment' %>
 </div>
                               
 <p><strong><%=l(:field_description)%></strong></p>
@@ -67,9 +67,9 @@ end %>
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
 </div>
 
-<%= link_to_attachments @issue %>
+<% if @issue.attachments.any? %>
-
+<%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>
-<%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %>
+<% end %>
 
 <% if authorize_for('issue_relations', 'new') || @issue.relations.any? %>
 <hr />

app/views/layouts/_project_selector.rhtml

@@ -3,10 +3,10 @@
 <option selected="selected"><%= l(:label_jump_to_a_project) %></option>
 <option disabled="disabled">---</option>
 <% user_projects_by_root.keys.sort.each do |root| %>
-    <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root, :jump => current_menu_item)) %>
+    <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
     <% user_projects_by_root[root].sort.each do |project| %>
         <% next if project == root %>
-        <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project, :jump => current_menu_item)) %>
+        <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
     <% end %>
 <% end %>
 </select>

app/views/layouts/base.rhtml

@@ -47,20 +47,19 @@
 <%= tag('div', {:id => 'main', :class => (has_content?(:sidebar) ? '' : 'nosidebar')}, true) %>
     <div id="sidebar">        
         <%= yield :sidebar %>
-        <%= call_hook :view_layouts_base_sidebar %>
     </div>
     
     <div id="content">
-				<%= render_flash_messages %>
+            <%= content_tag('div', flash[:error], :class => 'flash error') if flash[:error] %>
+            <%= content_tag('div', flash[:notice], :class => 'flash notice') if flash[:notice] %>
         <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
     </div>
 </div>
 
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 	
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2009 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>

app/views/mailer/account_activated.text.html.rhtml

@@ -1,2 +0,0 @@
-<p><%= l(:notice_account_activated) %></p>
-<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>

app/views/mailer/account_activated.text.plain.rhtml

@@ -1,2 +0,0 @@
-<%= l(:notice_account_activated) %>
-<%= l(:label_login) %>: <%= @login_url %>

app/views/mailer/layout.text.html.rhtml

@@ -6,12 +6,17 @@ body {
   font-size: 0.8em;
   color:#484848;
 }
-h1, h2, h3 { font-family: "Trebuchet MS", Verdana, sans-serif; margin: 0px; }
+h1 {
-h1 { font-size: 1.2em; }
+  font-family: "Trebuchet MS", Verdana, sans-serif;
-h2, h3 { font-size: 1.1em; }
+  font-size: 1.2em;
-a, a:link, a:visited { color: #2A5685;}
+  margin: 0px;
-a:hover, a:active { color: #c61a1a; }
+}
-a.wiki-anchor { display: none; }
+a, a:link, a:visited {
+  color: #2A5685;
+}
+a:hover, a:active {
+  color: #c61a1a;
+}
 hr {
   width: 100%;
   height: 1px;

app/views/mailer/layout.text.plain.rhtml

@@ -1,3 +1,3 @@
 <%= yield %>
--- 
+----------------------------------------
 <%= Setting.emails_footer %>

app/views/mailer/reminder.text.html.rhtml

@@ -2,7 +2,7 @@
 
 <ul>
 <% @issues.each do |issue| -%>
-  <li><%=h issue.project %> - <%=link_to("#{issue.tracker} ##{issue.id}", :controller => 'issues', :action => 'show', :id => issue, :only_path => false)%>: <%=h issue.subject %></li>
+    <li><%=h "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %></li>
 <% end -%>
 </ul>
 

app/views/messages/show.rhtml

@@ -15,7 +15,7 @@
 <div class="wiki">
 <%= textilizable(@topic.content, :attachments => @topic.attachments) %>
 </div>
-<%= link_to_attachments @topic, :author => false %>
+<%= link_to_attachments @topic.attachments, :no_author => true %>
 </div>
 <br />
 
@@ -31,7 +31,7 @@
   <div class="message reply">
   <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
   <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
-  <%= link_to_attachments message, :author => false %>
+  <%= link_to_attachments message.attachments, :no_author => true %>
   </div>
 <% end %>
 <% end %>

app/views/my/account.rhtml

@@ -15,7 +15,6 @@
 <p><%= f.text_field :lastname, :required => true %></p>
 <p><%= f.text_field :mail, :required => true %></p>
 <p><%= f.select :language, lang_options_for_select %></p>
-<%= call_hook(:view_my_account, :user => @user, :form => f) %>
 </div>
 
 <%= submit_tag l(:button_save) %>

app/views/my/blocks/_timelog.rhtml

@@ -47,6 +47,6 @@ entries_by_day = entries.group_by(&:spent_on)
     </tr>
     <% end -%>
 <% end -%>
-</tbody>
+</tbdoy>
 </table>
 <% end %>

app/views/projects/_form.rhtml

@@ -11,7 +11,7 @@
 <p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
 <p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
 <% unless @project.identifier_frozen? %>
-<br /><em><%= l(:text_length_between, 1, 20) %> <%= l(:text_project_identifier_info) %></em>
+<br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
 <% end %></p>
 <p><%= f.text_field :homepage, :size => 60 %></p>
 <p><%= f.check_box :is_public %></p>

app/views/projects/activity.rhtml

@@ -46,9 +46,7 @@
 <% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_activity) %></h3>
 <p><% @activity.event_types.each do |t| %>
-<%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
+<label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
-<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%>
-<br />
 <% end %></p>
 <% if @project && @project.active_children.any? %>
     <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>

app/views/projects/add_file.rhtml

@@ -4,11 +4,8 @@
 <div class="box">
 <% form_tag({ :action => 'add_file', :id => @project }, :multipart => true, :class => "tabular") do %>
 
-<% if @versions.any? %>
+<p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
-<p><label for="version_id"><%=l(:field_version)%></label>
+<%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
-<%= select_tag "version_id", content_tag('option', '') +
-														 options_from_collection_for_select(@versions, "id", "name") %></p>
-<% end %>
 
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>

app/views/projects/list_files.rhtml

@@ -4,41 +4,39 @@
 
 <h2><%=l(:label_attachment_plural)%></h2>
 
-<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<% delete_allowed = authorize_for('versions', 'destroy_file') %>
 
-<table class="list files">
+<table class="list">
   <thead><tr>
+    <th><%=l(:field_version)%></th>
     <%= sort_header_tag('filename', :caption => l(:field_filename)) %>
     <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %>
     <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %>
     <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
     <th>MD5</th>
-    <th></th>
+    <% if delete_allowed %><th></th><% end %>
   </tr></thead>
   <tbody>
-<% @containers.each do |container| %>	
+<% for version in @versions %>	
-  <% next if container.attachments.empty? -%>
+  <% unless version.attachments.empty? %>
-	<% if container.is_a?(Version) -%>
+  <tr><th colspan="7" align="left"><span class="icon icon-package"><b><%= version.name %></b></span></th></tr>
-  <tr>
+  <% for file in version.attachments %>		
-  	<th colspan="6" align="left">
+  <tr class="<%= cycle("odd", "even") %>">
-  		<%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package") %>
+    <td></td>
-		</th>
+    <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
-	</tr>
+    <td align="center"><%= format_time(file.created_on) %></td>
-	<% end -%>
+    <td align="center"><%= number_to_human_size(file.filesize) %></td>
-  <% container.attachments.each do |file| %>		
+    <td align="center"><%= file.downloads %></td>
-  <tr class="file <%= cycle("odd", "even") %>">
+    <td align="center"><small><%= file.digest %></small></td>
-    <td class="filename"><%= link_to_attachment file, :download => true, :title => file.description %></td>
+    <% if delete_allowed %>
-    <td class="created_on"><%= format_time(file.created_on) %></td>
-    <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-    <td class="downloads"><%= file.downloads %></td>
-    <td class="digest"><%= file.digest %></td>
     <td align="center">
-    <%= link_to(image_tag('delete.png'), {:controller => 'attachments', :action => 'destroy', :id => file},
+        <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post %>
-																				 :confirm => l(:text_are_you_sure), :method => :post) if delete_allowed %>
     </td>
+    <% end %>
   </tr>		
   <% end
   reset_cycle %>
+  <% end %>
 <% end %>
   </tbody>
 </table>

app/views/projects/settings.rhtml

@@ -1,8 +1,6 @@
 <h2><%=l(:label_settings)%></h2>
 
 <% tabs = project_settings_tabs %>
-
-<% if tabs.any? %>
 <% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
 
 <div class="tabs">
@@ -22,8 +20,5 @@
                        :style => (tab[:name] != selected_tab ? 'display:none' : nil),
                        :class => 'tab-content') %>
 <% end -%>
-<% else %>
-<p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
 
 <% html_title(l(:label_settings)) -%>

app/views/projects/settings/_versions.rhtml

@@ -17,6 +17,7 @@
     <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
     <td align="center"><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></td>
     <td align="center"><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></td>
+    </td>
     </tr>
 <% end; reset_cycle %>
     </tbody>

app/views/projects/show.rhtml

@@ -32,7 +32,6 @@
     <p><%= link_to l(:label_issue_view_all), :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 %></p>
   </div>
   <% end %>
-  <%= call_hook(:view_projects_show_left, :project => @project) %>
 </div>
 
 <div class="splitcontentright">
@@ -54,7 +53,6 @@
     <p><%= link_to l(:label_news_view_all), :controller => 'news', :action => 'index', :project_id => @project %></p>
   </div>  
   <% end %>
-  <%= call_hook(:view_projects_show_right, :project => @project) %>
 </div>
 
 <% content_for :sidebar do %>

app/views/repositories/_link_to_functions.rhtml

@@ -1,10 +0,0 @@
-<p>
-<% if @repository.supports_cat? %>
-    <%= link_to_if action_name != 'entry', l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<% if @repository.supports_annotate? %>
-    <%= link_to_if action_name != 'annotate', l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
-<% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
-<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
-</p>

app/views/repositories/annotate.rhtml

@@ -1,7 +1,5 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
-<p><%= render :partial => 'link_to_functions' %></p>
-
 <% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
 
 <div class="autoscroll">
@@ -11,7 +9,7 @@
     <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
     <% revision = @annotate.revisions[line_num-1] %>
     <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
-      <th class="line-num" id="L<%= line_num %>"><a href="#L<%= line_num %>"><%= line_num %></a></th>
+      <th class="line-num"><%= line_num %></th>
       <td class="revision">
       <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
       <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>

app/views/repositories/changes.rhtml

@@ -1,6 +1,15 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
 
-<p><%= render :partial => 'link_to_functions' %></p>
+<p>
+<% if @repository.supports_cat? %>
+    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+<% end %>
+<% if @repository.supports_annotate? %>
+    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
+<% end %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+<%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
+</p>
 
 <%= render_properties(@properties) %>
 

app/views/repositories/entry.rhtml

@@ -1,7 +1,5 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
-<p><%= render :partial => 'link_to_functions' %></p>
-
 <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
 
 <% content_for :header_tags do %>

app/views/settings/_issues.rhtml

@@ -11,12 +11,12 @@
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 </div>
 
-<fieldset class="box settings"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+<fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
 <%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
-<% Query.new.available_columns.each do |column| %>
+<p><% Query.new.available_columns.each do |column| %>
   <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
-	<%= column.caption %></label><br />
+  <%= column.caption %></label>
-<% end %>
+<% end %></p>
 </fieldset>
 
 <%= submit_tag l(:button_save) %>

app/views/timelog/details.rhtml

@@ -7,7 +7,7 @@
 <h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
-<%= hidden_field_tag('project_id', params[:project_id]) if @project %>
+<%= hidden_field_tag 'project_id', params[:project_id] %>
 <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
 <%= render :partial => 'date_range' %>
 <% end %>

app/views/timelog/report.rhtml

@@ -10,7 +10,7 @@
   <% @criterias.each do |criteria| %>
     <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
   <% end %>
-  <%= hidden_field_tag('project_id', params[:project_id]) if @project %>
+  <%= hidden_field_tag 'project_id', params[:project_id] %>
   <%= render :partial => 'date_range' %>
 
   <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],

app/views/users/_form.rhtml

@@ -13,7 +13,6 @@
 <% end %>
 
 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
-<%= call_hook(:view_users_form, :user => @user, :form => f) %>
 </div>
 
 <div class="box">

app/views/users/_memberships.rhtml

@@ -4,7 +4,6 @@
 	  <th><%= l(:label_project) %></th>
 	  <th><%= l(:label_role) %></th>
 	  <th style="width:15%"></th>
-      <%= call_hook(:view_users_memberships_table_header, :user => @user )%>
 	</thead>
 	<tbody>
 	<% @memberships.each do |membership| %>
@@ -20,7 +19,6 @@
     <td align="center">
       <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
     </td>
-      <%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => @roles, :projects => @projects )%>
 	</tr>
 	</tbody>
 <% end; reset_cycle %>

app/views/versions/show.rhtml

@@ -1,6 +1,5 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
-<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
 </div>
 
 <h2><%= h(@version.name) %></h2>

app/views/welcome/index.rhtml

@@ -9,7 +9,6 @@
 		<%= link_to l(:label_news_view_all), :controller => 'news' %>
   </div>
   <% end %>
-  <%= call_hook(:view_welcome_index_left, :projects => @projects) %>
 </div>
 
 <div class="splitcontentright">
@@ -26,7 +25,6 @@
 		</ul>
 	</div>
 	<% end %>
-    <%= call_hook(:view_welcome_index_right, :projects => @projects) %>
 </div>	
 
 <% content_for :header_tags do %>

app/views/wiki/export.rhtml

@@ -5,7 +5,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 {  font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 ul.toc { padding: 4px; margin-left: 0; }
 ul.toc li { list-style-type:none; }
 ul.toc li.heading2 { margin-left: 1em; }

app/views/wiki/export_multiple.rhtml

@@ -5,7 +5,7 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
-h1, h2, h3, h4 {  font-family: "Trebuchet MS",Georgia,"Times New Roman",serif; }
+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 </style>
 </head>
 <body>

app/views/wiki/show.rhtml

@@ -28,10 +28,9 @@
 
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
 
-<%= link_to_attachments @page %>
+<%= link_to_attachments @page.attachments, :delete_url => ((@editable && authorize_for('wiki', 'destroy_attachment')) ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
 
 <% if @editable && authorize_for('wiki', 'add_attachment') %>
-<div id="wiki_add_attachment">
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                              :id => 'attach_files_link' %></p>
 <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
@@ -41,7 +40,6 @@
 <%= submit_tag l(:button_add) %>
 <%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
 <% end %>
-</div>
 <% end %>
 
 <p class="other-formats">

app/views/wiki/special_date_index.rhtml

@@ -20,11 +20,11 @@
 <% unless @pages.empty? %>
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'html' %></span>
 </p>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>

app/views/wiki/special_page_index.rhtml

@@ -13,11 +13,11 @@
 <% unless @pages.empty? %>
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'HTML', {:action => 'special', :page => 'export'} %></span>
 </p>
 <% end %>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_edits => 1, :format => 'atom', :key => User.current.rss_key) %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>

config/initializers/bigdecimal-segfault-fix.rb

@@ -1,30 +0,0 @@
-# Copyright (c) 2009 Michael Koziarski <michael@koziarski.com>
-# 
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-require 'bigdecimal'
-
-alias BigDecimalUnsafe BigDecimal
-
-
-# This fixes CVE-2009-1904 however it removes legitimate functionality that your
-# application may depend on.  You are *strongly* advised to upgrade your ruby
-# rather than relying on this fix for an extended period of time.
-
-def BigDecimal(initial, digits=0)
-  if initial.size > 255 || initial =~ /e/i
-    raise "Invalid big Decimal Value"
-  end
-  BigDecimalUnsafe(initial, digits)
-end
-

db/migrate/098_set_topic_authors_as_watchers.rb

@@ -2,10 +2,9 @@ class SetTopicAuthorsAsWatchers < ActiveRecord::Migration
   def self.up
     # Sets active users who created/replied a topic as watchers of the topic
     # so that the new watch functionality at topic level doesn't affect notifications behaviour
-    Message.connection.execute("INSERT INTO #{Watcher.table_name} (watchable_type, watchable_id, user_id)" +
+    Message.connection.execute("INSERT INTO watchers (watchable_type, watchable_id, user_id)" +
-                                 " SELECT DISTINCT 'Message', COALESCE(m.parent_id, m.id), m.author_id" +
+                                 " SELECT DISTINCT 'Message', COALESCE(messages.parent_id, messages.id), messages.author_id FROM messages, users" +
-                                 " FROM #{Message.table_name} m, #{User.table_name} u" +
+                                 " WHERE messages.author_id = users.id AND users.status = 1")
-                                 " WHERE m.author_id = u.id AND u.status = 1")
   end
 
   def self.down

doc/CHANGELOG

@@ -1,105 +1,10 @@
 == Redmine changelog
 
 Redmine - project management software
-Copyright (C) 2006-2009  Jean-Philippe Lang
+Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
-== 2009-09-13 v0.8.5
-
-* Incoming mail handler : Allow spaces between keywords and colon
-* Do not require a non-word character after a comma in Redmine links
-* Include issue hyperlinks in reminder emails
-* Prevent nil error when retrieving svn version
-* Various plugin hooks added
-* Add plugins information to script/about
-* Fixed: 500 Internal Server Error is raised if add an empty comment to the news
-* Fixed: Atom links for wiki pages are not correct
-* Fixed: Atom feeds leak email address
-* Fixed: Case sensitivity in Issue filtering
-* Fixed: When reading RSS feed, the inline-embedded images are not properly shown
-
-
-== 2009-05-17 v0.8.4
-
-* Allow textile mailto links
-* Fixed: memory consumption when uploading file
-* Fixed: Mercurial integration doesn't work if Redmine is installed in folder path containing space
-* Fixed: an error is raised when no tab is available on project settings
-* Fixed: insert image macro corrupts urls with excalamation marks
-* Fixed: error on cross-project gantt PNG export
-* Fixed: self and alternate links in atom feeds do not respect Atom specs
-* Fixed: accept any svn tunnel scheme in repository URL
-* Fixed: issues/show should accept user's rss key
-* Fixed: consistency of custom fields display on the issue detail view
-* Fixed: wiki comments length validation is missing
-* Fixed: weak autologin token generation algorithm causes duplicate tokens
-
-
-== 2009-04-05 v0.8.3
-
-* Separate project field and subject in cross-project issue view
-* Ability to set language for redmine:load_default_data task using REDMINE_LANG environment variable
-* Rescue Redmine::DefaultData::DataAlreadyLoaded in redmine:load_default_data task
-* CSS classes to highlight own and assigned issues
-* Hide "New file" link on wiki pages from printing
-* Flush buffer when asking for language in redmine:load_default_data task
-* Minimum project identifier length set to 1
-* Include headers so that emails don't trigger vacation auto-responders
-* Fixed: Time entries csv export links for all projects are malformed
-* Fixed: Files without Version aren't visible in the Activity page
-* Fixed: Commit logs are centered in the repo browser
-* Fixed: News summary field content is not searchable
-* Fixed: Journal#save has a wrong signature
-* Fixed: Email footer signature convention
-* Fixed: Timelog report do not show time for non-versioned issues
-
-
-== 2009-03-07 v0.8.2
-
-* Send an email to the user when an administrator activates a registered user
-* Strip keywords from received email body
-* Footer updated to 2009
-* Show RSS-link even when no issues is found
-* One click filter action in activity view
-* Clickable/linkable line #'s while browsing the repo or viewing a file
-* Links to versions on files list
-* Added request and controller objects to the hooks by default
-* Fixed: exporting an issue with attachments to PDF raises an error
-* Fixed: "too few arguments" error may occur on activerecord error translation
-* Fixed: "Default columns Displayed on the Issues list" setting is not easy to read
-* Fixed: visited links to closed tickets are not striked through with IE6
-* Fixed: MailHandler#plain_text_body returns nil if there was nothing to strip
-* Fixed: MailHandler raises an error when processing an email without From header
-
-
-== 2009-02-15 v0.8.1
-
-* Select watchers on new issue form
-* Issue description is no longer a required field
-* Files module: ability to add files without version
-* Jump to the current tab when using the project quick-jump combo
-* Display a warning if some attachments were not saved
-* Import custom fields values from emails on issue creation
-* Show view/annotate/download links on entry and annotate views
-* Admin Info Screen: Display if plugin assets directory is writable
-* Adds a 'Create and continue' button on the new issue form
-* IMAP: add options to move received emails
-* Do not show Category field when categories are not defined
-* Lower the project identifier limit to a minimum of two characters
-* Add "closed" html class to closed entries in issue list
-* Fixed: broken redirect URL on login failure
-* Fixed: Deleted files are shown when using Darcs
-* Fixed: Darcs adapter works on Win32 only
-* Fixed: syntax highlight doesn't appear in new ticket preview
-* Fixed: email notification for changes I make still occurs when running Repository.fetch_changesets
-* Fixed: no error is raised when entering invalid hours on the issue update form
-* Fixed: Details time log report CSV export doesn't honour date format from settings
-* Fixed: invalid css classes on issue details
-* Fixed: Trac importer creates duplicate custom values
-* Fixed: inline attached image should not match partial filename
-
-
 == 2008-12-30 v0.8.0
 
 * Setting added in order to limit the number of diff lines that should be displayed