X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/625e7c3296c46141d199a8a0c69822bc1b38ae6a..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/controllers/users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0830e51d4..471215c92 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,6 @@ class UsersController < ApplicationController
   include EmailMethods
   include SessionMethods
   include UserMethods
-  include PaginationMethods
 
   layout "site"
 
@@ -21,28 +20,6 @@ class UsersController < ApplicationController
   allow_thirdparty_images :only => :show
   allow_social_login :only => :new
 
-  ##
-  # display a list of users matching specified criteria
-  def index
-    if request.post?
-      ids = params[:user].keys.collect(&:to_i)
-
-      User.where(:id => ids).update_all(:status => "confirmed") if params[:confirm]
-      User.where(:id => ids).update_all(:status => "deleted") if params[:hide]
-
-      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
-    else
-      @params = params.permit(:status, :ip, :before, :after)
-
-      users = User.all
-      users = users.where(:status => @params[:status]) if @params[:status]
-      users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
-
-      @users_count = users.count
-      @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)
-    end
-  end
-
   def show
     @user = User.find_by(:display_name => params[:display_name])
 
@@ -264,7 +241,7 @@ class UsersController < ApplicationController
   def save_new_user(email_hmac, referer = nil)
     current_user.data_public = true
     current_user.description = "" if current_user.description.nil?
-    current_user.creation_ip = request.remote_ip
+    current_user.creation_address = request.remote_ip
     current_user.languages = http_accept_language.user_preferred_languages
     current_user.terms_agreed = Time.now.utc
     current_user.tou_agreed = Time.now.utc