Commit 99a12ecb authored by Eric Davis's avatar Eric Davis

[#129] Replace public strings using Redmine with ChiliProject

parent 584bfbde
......@@ -29,8 +29,8 @@ class ApplicationController < ActionController::Base
# TODO: remove it when Rails is fixed
before_filter :delete_broken_cookies
def delete_broken_cookies
if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/
cookies.delete '_redmine_session'
if cookies['_chiliproject_session'] && cookies['_chiliproject_session'] !~ /--/
cookies.delete '_chiliproject_session'
redirect_to home_path
return false
end
......@@ -129,9 +129,9 @@ class ApplicationController < ActionController::Base
respond_to do |format|
format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
format.xml { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' }
format.xml { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
end
return false
end
......@@ -407,8 +407,8 @@ class ApplicationController < ActionController::Base
def api_key_from_request
if params[:key].present?
params[:key]
elsif request.headers["X-Redmine-API-Key"].present?
request.headers["X-Redmine-API-Key"]
elsif request.headers["X-ChiliProject-API-Key"].present?
request.headers["X-ChiliProject-API-Key"]
end
end
......@@ -437,7 +437,7 @@ class ApplicationController < ActionController::Base
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query)
sort_clear if respond_to?(:sort_clear)
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
render_error "An error occurred while executing the query and has been logged. Please report this error to your administrator."
end
# Converts the errors on an ActiveRecord object into a common JSON format
......
......@@ -917,10 +917,10 @@ module ApplicationHelper
@included_in_api_response.include?(arg.to_s)
end
# Returns options or nil if nometa param or X-Redmine-Nometa header
# Returns options or nil if nometa param or X-ChiliProject-Nometa header
# was set in the request
def api_meta(options)
if params[:nometa].present? || request.headers['X-Redmine-Nometa']
if params[:nometa].present? || request.headers['X-ChiliProject-Nometa']
# compatibility mode for activeresource clients that raise
# an error when unserializing an array with attributes
nil
......
......@@ -47,7 +47,7 @@ class MailHandler < ActionMailer::Base
sender_email = email.from.to_a.first.to_s.strip
# Ignore emails received from the application emission address to avoid hell cycles
if sender_email.downcase == Setting.mail_from.to_s.strip.downcase
logger.info "MailHandler: ignoring email from Redmine emission address [#{sender_email}]" if logger && logger.info
logger.info "MailHandler: ignoring email from emission address [#{sender_email}]" if logger && logger.info
return false
end
@user = User.find_by_mail(sender_email) if sender_email.present?
......@@ -81,7 +81,7 @@ class MailHandler < ActionMailer::Base
private
MESSAGE_ID_RE = %r{^<redmine\.([a-z0-9_]+)\-(\d+)\.\d+@}
MESSAGE_ID_RE = %r{^<chiliproject\.([a-z0-9_]+)\-(\d+)\.\d+@}
ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]*#(\d+)\]}
MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]*msg(\d+)\]}
......
......@@ -281,7 +281,7 @@ class Mailer < ActionMailer::Base
redmine_headers 'Type' => "Test"
set_language_if_valid(user.language)
recipients user.mail
subject 'Redmine test'
subject 'ChiliProject test'
body :url => url_for(:controller => 'welcome')
render_multipart('test', body)
end
......@@ -362,16 +362,16 @@ class Mailer < ActionMailer::Base
from Setting.mail_from
# Common headers
headers 'X-Mailer' => 'Redmine',
'X-Redmine-Host' => Setting.host_name,
'X-Redmine-Site' => Setting.app_title,
headers 'X-Mailer' => 'ChiliProject',
'X-ChiliProject-Host' => Setting.host_name,
'X-ChiliProject-Site' => Setting.app_title,
'Precedence' => 'bulk',
'Auto-Submitted' => 'auto-generated'
end
# Appends a Redmine header field (name is prepended with 'X-Redmine-')
# Appends a Redmine header field (name is prepended with 'X-ChiliProject-')
def redmine_headers(h)
h.each { |k,v| headers["X-Redmine-#{k}"] = v }
h.each { |k,v| headers["X-ChiliProject-#{k}"] = v }
end
# Overrides the create_mail method
......@@ -425,9 +425,9 @@ class Mailer < ActionMailer::Base
# id + timestamp should reduce the odds of a collision
# as far as we don't send multiple emails for the same object
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
hash = "chiliproject.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
host = "#{::Socket.gethostname}.redmine" if host.empty?
host = "#{::Socket.gethostname}.chiliproject" if host.empty?
"<#{hash}@#{host}>"
end
......
......@@ -69,7 +69,7 @@
<div id="footer">
<div class="bgl"><div class="bgr">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2010-2011 ChiliProject Team
</div></div>
</div>
</div>
......
<p>This is a test email sent by Redmine.<br />
Redmine URL: <%= auto_link(@url) %></p>
<p>This is a test email sent by ChiliProject.<br />
ChiliProject URL: <%= auto_link(@url) %></p>
This is a test email sent by Redmine.
Redmine URL: <%= @url %>
This is a test email sent by ChiliProject.
ChiliProject URL: <%= @url %>
......@@ -20,7 +20,7 @@
# Settings can be defined through the application in Admin -> Settings
app_title:
default: Redmine
default: ChiliProject
app_subtitle:
default: Project management
welcome_text:
......@@ -46,7 +46,7 @@ activity_days_default:
per_page_options:
default: '25,50,100'
mail_from:
default: redmine@example.net
default: chiliproject@example.net
bcc_recipients:
default: 1
plain_text_mail:
......
......@@ -288,7 +288,7 @@ class Setup < ActiveRecord::Migration
user = User.create :login => "admin",
:hashed_password => "d033e22ae348aeb5660fc2140aec35850c4da997",
:admin => true,
:firstname => "Redmine",
:firstname => "ChiliProject",
:lastname => "Admin",
:mail => "admin@example.net",
:mail_notification => true,
......
module Redmine
module Info
class << self
def app_name; 'Redmine' end
def url; 'http://www.redmine.org/' end
def help_url; 'http://www.redmine.org/guide' end
def app_name; 'ChiliProject' end
def url; 'https://www.chiliproject.org/' end
def help_url; 'https://www.chiliproject.org/guide' end
def versioned_name; "#{app_name} #{Redmine::VERSION}" end
# Creates the url string to a specific Redmine issue
......
......@@ -16,7 +16,7 @@ file 'config/initializers/session_store.rb' do
# secret is at least 30 characters and all random, no regular words or
# you'll be exposed to dictionary attacks.
ActionController::Base.session = {
:key => '_redmine_session',
:key => '_chiliproject_session',
#
# Uncomment and edit the :session_path below if are hosting your Redmine
# at a suburi and don't want the top level path to access the cookies
......
......@@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris>
In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <JSmith@somenet.foo>
To: <redmine@somenet.foo>
Subject: Re: update to issue 2
......
......@@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris>
In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <JSmith@somenet.foo>
To: <redmine@somenet.foo>
Subject: Re: update to issue 2
......
......@@ -5,8 +5,8 @@ User-Agent: Thunderbird 2.0.0.19 (Windows/20081209)
MIME-Version: 1.0
To: redmine@somenet.foo
Subject: Reply via email
References: <redmine.message-2.20070512171800@somenet.foo>
In-Reply-To: <redmine.message-2.20070512171800@somenet.foo>
References: <chiliproject.message-2.20070512171800@somenet.foo>
In-Reply-To: <chiliproject.message-2.20070512171800@somenet.foo>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
......
Return-Path: <redmine@somenet.foo>
Return-Path: <chiliproject@somenet.foo>
Received: from osiris ([127.0.0.1])
by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
From: "John Doe" <Redmine@example.net>
To: <redmine@somenet.foo>
Subject: Ticket with the Redmine emission address
From: "John Doe" <Chiliproject@example.net>
To: <chiliproject@somenet.foo>
Subject: Ticket with the Chiliproject emission address
Date: Sun, 22 Jun 2008 12:28:07 +0200
MIME-Version: 1.0
Content-Type: text/plain;
......@@ -14,6 +14,6 @@ Content-Type: text/plain;
reply-type=original
Content-Transfer-Encoding: 7bit
This is a ticket submitted with the Redmine emission address.
This is a ticket submitted with the Chiliproject emission address.
It should be ignored.
......@@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS
with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200
Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris>
In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <jsmith@somenet.foo>
To: <redmine@somenet.foo>
References: <485d0ad366c88_d7014663a025f@osiris.tmail>
......
......@@ -56,7 +56,7 @@ class ProjectsControllerTest < ActionController::TestCase
get :index, :format => 'atom'
assert_response :success
assert_template 'common/feed.atom.rxml'
assert_select 'feed>title', :text => 'Redmine: Latest projects'
assert_select 'feed>title', :text => 'ChiliProject: Latest projects'
assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
end
......
......@@ -89,7 +89,7 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
context "with nometa header" do
should "not contain metadata" do
get '/issues.xml', {}, {'X-Redmine-Nometa' => '1'}
get '/issues.xml', {}, {'X-ChiliProject-Nometa' => '1'}
assert_tag :tag => 'issues',
:attributes => {
......
......@@ -361,11 +361,11 @@ class ActiveSupport::TestCase
end
end
context "should allow key based auth using X-Redmine-API-Key header for #{http_method} #{url}" do
context "should allow key based auth using X-ChiliProject-API-Key header for #{http_method} #{url}" do
setup do
@user = User.generate_with_protected!(:admin => true)
@token = Token.generate!(:user => @user, :action => 'api')
send(http_method, url, parameters, {'X-Redmine-API-Key' => @token.value.to_s})
send(http_method, url, parameters, {'X-ChiliProject-API-Key' => @token.value.to_s})
end
should_respond_with success_code
......
......@@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__)
class SettingTest < ActiveSupport::TestCase
def test_read_default
assert_equal "Redmine", Setting.app_title
assert_equal "ChiliProject", Setting.app_title
assert Setting.self_registration?
assert !Setting.login_required?
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment