X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e8d32637c16aaba887a3c2c54eab68ab92da7f5b..878bdabee8b44930cca1bc8354ad249d70d8c893:/app/controllers/application_controller.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 4ac3297c6..3830df88b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -5,20 +5,11 @@ class ApplicationController < ActionController::Base 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 @@ -50,7 +41,7 @@ class ApplicationController < ActionController::Base 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 @@ -116,6 +107,9 @@ class ApplicationController < ActionController::Base def require_allow_write_gpx require_capability(:allow_write_gpx) end + def require_allow_write_notes + require_capability(:allow_write_notes) + end ## # require that the user is a moderator, or fill out a helpful error message @@ -126,7 +120,7 @@ class ApplicationController < ActionController::Base 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 @@ -210,20 +204,49 @@ class ApplicationController < ActionController::Base end def check_api_readable - if STATUS == :database_offline or STATUS == :api_offline + if api_status == :offline report_error "Database offline for maintenance", :service_unavailable return false end end def check_api_writable - if STATUS == :database_offline or STATUS == :database_readonly or - STATUS == :api_offline or STATUS == :api_readonly + unless api_status == :online report_error "Database offline for maintenance", :service_unavailable return false end end + def database_status + if STATUS == :database_offline + :offline + elsif STATUS == :database_readonly + :readonly + else + :online + end + end + + def api_status + status = database_status + if status == :online + if STATUS == :api_offline + status = :offline + elsif STATUS == :api_readonly + status = :readonly + end + end + return status + end + + def gpx_status + status = database_status + if status == :online + status = :offline if STATUS == :gpx_offline + end + return status + end + def require_public_data unless @user.data_public? report_error "You must make your edits public to upload new data", :forbidden @@ -249,51 +272,56 @@ class ApplicationController < ActionController::Base 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 + + 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 request.compatible_language_from(I18n.available_locales).nil? - request.user_preferred_languages = request.user_preferred_languages.collect do |pl| + 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 @@ -338,7 +366,7 @@ class ApplicationController < ActionController::Base 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 @@ -351,40 +379,6 @@ class ApplicationController < ActionController::Base 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? @@ -407,7 +401,7 @@ class ApplicationController < ActionController::Base 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 @@ -424,6 +418,28 @@ class ApplicationController < ActionController::Base 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