X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8eef66cee2837ce5df84906dbcbf4c5a8df3bea2..f778b61c0358ad2d0593be4040406a418ae46579:/app/controllers/user_controller.rb diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 1d86c0524..7b3b596df 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -38,7 +38,7 @@ class UserController < ApplicationController else render :action => 'terms' end - elsif params[:user] and Acl.match(request.remote_ip, params[:user][:email].split("@").last).where(:k => "no_account_creation").exists? + elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) render :action => 'blocked' else session[:referer] = params[:referer] @@ -112,7 +112,7 @@ class UserController < ApplicationController else redirect_to :action => :account, :display_name => @user.display_name end - elsif Acl.match(request.remote_ip, params[:user][:email].split("@").last).where(:k => "no_account_creation").exists? + elsif Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last) render :action => 'blocked' else @user = User.new(params[:user]) @@ -271,7 +271,7 @@ class UserController < ApplicationController :openid_url => params[:openid]) flash.now[:notice] = t 'user.new.openid association' - elsif Acl.match(request.remote_ip).where(:k => "no_account_creation").exists? + elsif Acl.no_account_creation(request.remote_ip) render :action => 'blocked' end end