before_filter :fetch_body
- if STATUS == :database_readonly or STATUS == :database_offline
- def self.cache_sweeper(*sweepers)
- end
- end
-
def authorize_web
if session[:user]
@user = User.where(:id => session[:user]).where("status IN ('active', 'confirmed', 'suspended')").first
- if @user.display_name != cookies["_osm_username"]
- logger.info "Session user '#{@user.display_name}' does not match cookie user '#{cookies['_osm_username']}'"
- reset_session
- @user = nil
- elsif @user.status == "suspended"
+ if @user.status == "suspended"
session.delete(:user)
session_expires_automatically
if request.get?
redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
end
flash[:error] = t('application.require_moderator.not_a_moderator')
redirect_to :action => 'index'
else
- render :nothing => true, :status => :forbidden
+ render :text => "", :status => :forbidden
end
end
end
render :text => result.to_s, :content_type => "text/xml"
else
- render :text => message, :status => status
+ render :text => message, :status => status, :content_type => "text/plain"
end
end
def set_locale
response.header['Vary'] = 'Accept-Language'
- if @user
- if !@user.languages.empty?
- request.user_preferred_languages = @user.languages
- response.header['Vary'] = '*'
- elsif !request.user_preferred_languages.empty?
- @user.languages = request.user_preferred_languages
- @user.save
- end
+ if @user && !@user.languages.empty?
+ http_accept_language.user_preferred_languages = @user.languages
+ response.header['Vary'] = '*'
end
- if request.compatible_language_from(I18n.available_locales).nil?
- request.user_preferred_languages = request.user_preferred_languages.collect do |pl|
+ I18n.locale = select_locale
+
+ if @user && @user.languages.empty? && !http_accept_language.user_preferred_languages.empty?
+ @user.languages = http_accept_language.user_preferred_languages
+ @user.save
+ end
+
+ response.headers['Content-Language'] = I18n.locale.to_s
+ end
+
+ def select_locale(locales = I18n.available_locales)
+ if params[:locale]
+ http_accept_language.user_preferred_languages = [ params[:locale] ]
+ end
+
+ if http_accept_language.compatible_language_from(locales).nil?
+ http_accept_language.user_preferred_languages = http_accept_language.user_preferred_languages.collect do |pl|
pls = [ pl ]
while pl.match(/^(.*)-[^-]+$/)
- pls.push($1) if I18n.available_locales.include?($1.to_sym)
+ pls.push($1) if locales.include?($1) or 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 = params[:locale] || request.compatible_language_from(I18n.available_locales) || I18n.default_locale
-
- response.headers['Content-Language'] = I18n.locale.to_s
+ http_accept_language.compatible_language_from(locales) || I18n.default_locale
end
+ helper_method :select_locale
+
def api_call_handle_error
begin
yield
rescue ActiveRecord::RecordNotFound => ex
- render :nothing => true, :status => :not_found
+ render :text => "", :status => :not_found
rescue LibXML::XML::Error, ArgumentError => ex
report_error ex.message, :bad_request
rescue ActiveRecord::RecordInvalid => ex
rescue ActionView::Template::Error => ex
ex = ex.original_exception
- if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /^Timeout::Error/
+ if ex.is_a?(ActiveRecord::StatementInvalid) and ex.message =~ /execution expired/
ex = Timeout::Error.new
end
render :action => "timeout"
end
- ##
- # extend caches_action to include the parameters, locale and logged in
- # status in all cache keys
- def self.caches_action(*actions)
- options = actions.extract_options!
- cache_path = options[:cache_path] || Hash.new
-
- options[:unless] = case options[:unless]
- when NilClass then Array.new
- when Array then options[:unless]
- else unlessp = [ options[:unless] ]
- end
-
- 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(:host => SERVER_URL, :locale => I18n.locale)
- end
-
- actions.push(options)
-
- super *actions
- end
-
- ##
- # extend expire_action to expire all variants
- def expire_action(options = {})
- I18n.available_locales.each do |locale|
- super options.merge(:host => SERVER_URL, :locale => locale)
- end
- end
-
##
# is the requestor logged in?
def logged_in?
respond_to do |format|
format.html { render :template => "user/no_such_user", :status => :not_found }
- format.all { render :nothing => true, :status => :not_found }
+ format.all { render :text => "", :status => :not_found }
end
end
request.body.rewind
end
+ def map_layout
+ request.xhr? ? 'xhr' : 'map'
+ end
+
+ def preferred_editor
+ editor = if params[:editor]
+ params[:editor]
+ elsif @user and @user.preferred_editor
+ @user.preferred_editor
+ else
+ DEFAULT_EDITOR
+ end
+
+ if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ and editor == 'id'
+ editor = 'potlatch2'
+ end
+
+ editor
+ end
+
+ helper_method :preferred_editor
+
private
# extract authorisation credentials from headers, returns user = nil if none
projects / rails.git / blobdiff