Merge pull request #5406 from AntonKhorev/offline-message-oauth

[rails.git] / app / controllers / users_controller.rb

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index b7c156bd913e98e11cdad31d496c14ef12fd5891..63a83ad1da8ad9803c3980ade89dbe0755398bea 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -36,10 +36,14 @@ class UsersController < ApplicationController
 
       users = User.all
       users = users.where(:status => @params[:status]) if @params[:status]
 
       users = User.all
       users = users.where(:status => @params[:status]) if @params[:status]

-      users = users.where(:creation_ip => @params[:ip]) if @params[:ip]
+      users = users.where(:creation_address => @params[:ip]) if @params[:ip]
+
+      @users_count = users.limit(501).count
+      @users_count = I18n.t("count.at_least_pattern", :count => 500) if @users_count > 500

 
 

-      @users_count = users.count

       @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)
       @users, @newer_users_id, @older_users_id = get_page_items(users, :limit => 50)

+
+      render :partial => "page" if turbo_frame_request_id == "pagination"

     end
   end
 
     end
   end
 


@@ -262,40 +266,38 @@ class UsersController < ApplicationController
   private
 
   def save_new_user(email_hmac, referer = nil)
   private
 
   def save_new_user(email_hmac, referer = nil)

-    if check_signup_allowed(current_user.email)
-      current_user.data_public = true
-      current_user.description = "" if current_user.description.nil?
-      current_user.creation_ip = 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
-      current_user.terms_seen = true
-
-      if current_user.auth_uid.blank?
-        current_user.auth_provider = nil
-        current_user.auth_uid = nil
-      elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
-        current_user.activate
-      end
+    current_user.data_public = true
+    current_user.description = "" if current_user.description.nil?
+    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
+    current_user.terms_seen = true
+
+    if current_user.auth_uid.blank?
+      current_user.auth_provider = nil
+      current_user.auth_uid = nil
+    elsif email_hmac && ActiveSupport::SecurityUtils.secure_compare(email_hmac, UsersController.message_hmac(current_user.email))
+      current_user.activate
+    end

 
 

-      if current_user.save
-        SIGNUP_IP_LIMITER&.update(request.remote_ip)
-        SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))
+    if current_user.save
+      SIGNUP_IP_LIMITER&.update(request.remote_ip)
+      SIGNUP_EMAIL_LIMITER&.update(canonical_email(current_user.email))

 
 

-        flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)
+      flash[:matomo_goal] = Settings.matomo["goals"]["signup"] if defined?(Settings.matomo)

 
 

-        referer = welcome_path(welcome_options(referer))
+      referer = welcome_path(welcome_options(referer))

 
 

-        if current_user.status == "active"
-          successful_login(current_user, referer)
-        else
-          session[:pending_user] = current_user.id
-          UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
-          redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name
-        end
+      if current_user.status == "active"
+        successful_login(current_user, referer)

       else
       else

-        render :action => "new", :referer => params[:referer]
+        session[:pending_user] = current_user.id
+        UserMailer.signup_confirm(current_user, current_user.generate_token_for(:new_user), referer).deliver_later
+        redirect_to :controller => :confirmations, :action => :confirm, :display_name => current_user.display_name

       end
       end

+    else
+      render :action => "new", :referer => params[:referer]

     end
   end
 
     end
   end