# Likewise, all the methods added will be available for all controllers.
class ApplicationController < ActionController::Base
- if OSM_STATUS == :database_readonly or OSM_STATUS == :database_offline
+ if STATUS == :database_readonly or STATUS == :database_offline
session :off
end
@user = User.find(session[:user], :conditions => {:status => ["active", "confirmed", "suspended"]})
if @user.status == "suspended"
- session[:user] = nil
+ session.delete(:user)
session_expires_automatically
redirect_to :controller => "user", :action => "suspended"
+
+ # don't allow access to any auth-requiring part of the site unless
+ # the new CTs have been seen (and accept/decline chosen).
+ elsif !@user.terms_seen and flash[:skip_terms].nil?
+ flash[:notice] = t 'user.terms.you need to accept or decline'
+ if params[:referer]
+ redirect_to :controller => "user", :action => "terms", :referer => params[:referer]
+ else
+ redirect_to :controller => "user", :action => "terms", :referer => request.request_uri
+ end
end
elsif session[:token]
@user = User.authenticate(:token => session[:token])
# method, otherwise an OAuth token was used, which has to be checked.
unless current_token.nil?
unless current_token.read_attribute(cap)
- render :text => "OAuth token doesn't have that capability.", :status => :forbidden
+ report_error "OAuth token doesn't have that capability.", :forbidden
return false
end
end
def require_cookies
if request.cookies["_osm_session"].to_s == ""
if params[:cookie_test].nil?
+ session[:cookie_test] = true
redirect_to params.merge(:cookie_test => "true")
return false
else
flash.now[:warning] = t 'application.require_cookies.cookies_needed'
end
+ else
+ session.delete(:cookie_test)
end
end
end
def require_allow_write_api
require_capability(:allow_write_api)
+
+ if REQUIRE_TERMS_AGREED and @user.terms_agreed.nil?
+ report_error "You must accept the contributor terms before you can edit.", :forbidden
+ return false
+ end
end
def require_allow_read_gpx
require_capability(:allow_read_gpx)
end
end
- # check if the user has been banned
- unless @user.nil? or @user.active_blocks.empty?
- # NOTE: need slightly more helpful message than this.
- render :text => t('application.setup_user_auth.blocked'), :status => :forbidden
+ # have we identified the user?
+ if @user
+ # check if the user has been banned
+ if not @user.active_blocks.empty?
+ # NOTE: need slightly more helpful message than this.
+ report_error t('application.setup_user_auth.blocked'), :forbidden
+ end
+
+ # if the user hasn't seen the contributor terms then don't
+ # allow editing - they have to go to the web site and see
+ # (but can decline) the CTs to continue.
+ if REQUIRE_TERMS_SEEN and not @user.terms_seen and flash[:skip_terms].nil?
+ set_locale
+ report_error t('application.setup_user_auth.need_to_see_terms'), :forbidden
+ end
end
end
end
def check_database_readable(need_api = false)
- if OSM_STATUS == :database_offline or (need_api and OSM_STATUS == :api_offline)
+ if STATUS == :database_offline or (need_api and STATUS == :api_offline)
redirect_to :controller => 'site', :action => 'offline'
end
end
def check_database_writable(need_api = false)
- if OSM_STATUS == :database_offline or OSM_STATUS == :database_readonly or
- (need_api and (OSM_STATUS == :api_offline or OSM_STATUS == :api_readonly))
+ if STATUS == :database_offline or STATUS == :database_readonly or
+ (need_api and (STATUS == :api_offline or STATUS == :api_readonly))
redirect_to :controller => 'site', :action => 'offline'
end
end
def check_api_readable
- if OSM_STATUS == :database_offline or OSM_STATUS == :api_offline
- response.headers['Error'] = "Database offline for maintenance"
- render :nothing => true, :status => :service_unavailable
+ if STATUS == :database_offline or STATUS == :api_offline
+ report_error "Database offline for maintenance", :service_unavailable
return false
end
end
def check_api_writable
- if OSM_STATUS == :database_offline or OSM_STATUS == :database_readonly or
- OSM_STATUS == :api_offline or OSM_STATUS == :api_readonly
- response.headers['Error'] = "Database offline for maintenance"
- render :nothing => true, :status => :service_unavailable
+ if STATUS == :database_offline or STATUS == :database_readonly or
+ STATUS == :api_offline or STATUS == :api_readonly
+ report_error "Database offline for maintenance", :service_unavailable
return false
end
end
def require_public_data
unless @user.data_public?
- response.headers['Error'] = "You must make your edits public to upload new data"
- render :nothing => true, :status => :forbidden
+ report_error "You must make your edits public to upload new data", :forbidden
return false
end
end
def report_error(message, status = :bad_request)
# Todo: some sort of escaping of problem characters in the message
response.headers['Error'] = message
- render :text => message, :status => status
+
+ if request.headers['X-Error-Format'] and
+ request.headers['X-Error-Format'].downcase == "xml"
+ result = OSM::API.new.get_xml_doc
+ result.root.name = "osmError"
+ result.root << (XML::Node.new("status") << interpret_status(status))
+ result.root << (XML::Node.new("message") << message)
+
+ render :text => result.to_s, :content_type => "text/xml"
+ else
+ render :text => message, :status => status
+ end
end
def set_locale
end
end
+ if request.compatible_language_from(I18n.available_locales).nil?
+ request.user_preferred_languages = request.user_preferred_languages.collect do |pl|
+ pls = [ pl ]
+
+ while pl.match(/^(.*)-[^-]+$/)
+ pls.push($1) if I18n.available_locales.include?($1.to_sym)
+ pl = $1
+ end
+
+ pls
+ end.flatten
+
+ if @user and not request.compatible_language_from(I18n.available_locales).nil?
+ @user.languages = request.user_preferred_languages
+ @user.save
+ end
+ end
+
I18n.locale = request.compatible_language_from(I18n.available_locales)
response.headers['Content-Language'] = I18n.locale.to_s
##
# wrap an api call in a timeout
def api_call_timeout
- SystemTimer.timeout_after(APP_CONFIG['api_timeout']) do
+ SystemTimer.timeout_after(API_TIMEOUT) do
yield
end
rescue Timeout::Error
##
# wrap a web page in a timeout
def web_timeout
- SystemTimer.timeout_after(APP_CONFIG['web_timeout']) do
+ SystemTimer.timeout_after(WEB_TIMEOUT) do
yield
end
rescue ActionView::TemplateError => ex
options = actions.extract_options!
cache_path = options[:cache_path] || Hash.new
- options[:cache_path] = Proc.new do |controller|
- user = controller.instance_variable_get("@user")
-
- case
- when user.nil? then user = :none
- when user.display_name == controller.params[:display_name] then user = :self
- when user.administrator? then user = :administrator
- when user.moderator? then user = :moderator
- else user = :other
- end
+ options[:unless] = case options[:unless]
+ when NilClass then Array.new
+ when Array then options[:unless]
+ else unlessp = [ options[:unless] ]
+ end
- cache_path.merge(controller.params).merge(:locale => I18n.locale, :user => user)
+ options[:unless].push(Proc.new do |controller|
+ controller.params.include?(:page)
+ end)
+
+ options[:cache_path] = Proc.new do |controller|
+ cache_path.merge(controller.params).merge(:locale => I18n.locale)
end
actions.push(options)
##
# extend expire_action to expire all variants
def expire_action(options = {})
- path = ActionCachePath.path_for(self, options, false).gsub('?', '.').gsub(':', '.')
- expire_fragment(Regexp.new(Regexp.escape(path) + "\\..*"))
+ I18n.available_locales.each do |locale|
+ super options.merge(:locale => locale)
+ end
end
##
projects / rails.git / blobdiff