Merge remote-tracking branch 'upstream/pull/4126'

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0b7f6ec919e7ddec4683d08623fe2d508ecb37ca..ab13f93bed402541f31e6d470419128b6b29e6d5 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -104,11 +104,11 @@ class UsersController < ApplicationController
         render :action => "new"
       elsif current_user.auth_provider.present?
         # Verify external authenticator before moving on
-        session[:new_user] = current_user.attributes.slice("email", "display_name", "pass_crypt")
+        session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation")
         redirect_to auth_url(current_user.auth_provider, current_user.auth_uid), :status => :temporary_redirect
       else
         # Save the user record
-        session[:new_user] = current_user.attributes.slice("email", "display_name", "pass_crypt")
+        session[:new_user] = current_user.slice("email", "display_name", "pass_crypt", "pass_crypt_confirmation")
         redirect_to :action => :terms
       end
     end
@@ -311,20 +311,17 @@ class UsersController < ApplicationController
 
   def welcome_options
     uri = URI(session[:referer]) if session[:referer].present?
-    welcome_options = {}
-    welcome_options["oauth_return_url"] = uri&.to_s if uri&.path == oauth_authorization_path
+
+    return { "oauth_return_url" => uri&.to_s } if uri&.path == oauth_authorization_path
 
     begin
       %r{map=(.*)/(.*)/(.*)}.match(uri.fragment) do |m|
         editor = Rack::Utils.parse_query(uri.query).slice("editor")
-        welcome_options = { "zoom" => m[1],
-                            "lat" => m[2],
-                            "lon" => m[3] }.merge(editor).merge(welcome_options)
+        return { "zoom" => m[1], "lat" => m[2], "lon" => m[3] }.merge(editor)
       end
     rescue StandardError
       # Use default
     end
-    welcome_options
   end
 
   ##
@@ -358,6 +355,8 @@ class UsersController < ApplicationController
                    domain_mx_servers(domain)
                  end
 
+    return true if Acl.allow_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
+
     blocked = Acl.no_account_creation(request.remote_ip, :domain => domain, :mx => mx_servers)
 
     blocked ||= SIGNUP_IP_LIMITER && !SIGNUP_IP_LIMITER.allow?(request.remote_ip)