Hide route steps sidebar when user presses close button.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f02cd6dc1da5804a143bba654931901d22b30d8c..a7bf53824821a4559672b9d1446eccb7dc74bee3 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,263 +1,145 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site', :except => :api_details
+  layout 'site', :except => [:api_details]

 
 

+  skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files]
+  before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]

   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize, :only => [:api_details, :api_gpx_files]

-  before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
-  before_filter :set_locale, :except => [:api_details, :api_gpx_files]
+  before_filter :authorize_web, :except => [:api_read, :api_details, :api_gpx_files]
+  before_filter :set_locale, :except => [:api_read, :api_details, :api_gpx_files]

   before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
   before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]

-  before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
-  before_filter :check_database_writable, :only => [:login, :new, :account, :go_public, :make_friend, :remove_friend]
-  before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
+  before_filter :require_self, :only => [:account]
+  before_filter :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files]
+  before_filter :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
+  before_filter :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]

   before_filter :require_allow_read_prefs, :only => [:api_details]
   before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
   before_filter :require_allow_read_prefs, :only => [:api_details]
   before_filter :require_allow_read_gpx, :only => [:api_gpx_files]

-  before_filter :require_cookies, :only => [:login, :confirm]
-  before_filter :require_administrator, :only => [:activate, :deactivate, :hide, :unhide, :delete]
-  before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete]
-
-  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
+  before_filter :require_cookies, :only => [:new, :login, :confirm]
+  before_filter :require_administrator, :only => [:set_status, :delete, :list]
+  around_filter :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
+  before_filter :lookup_user_by_id, :only => [:api_read]
+  before_filter :lookup_user_by_name, :only => [:set_status, :delete]
+
+  def terms
+    @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE
+    @text = OSM.legal_text_for_country(@legale)
+
+    if request.xhr?
+      render :partial => "terms"
+    else
+      @title = t 'user.terms.title'

 
 

-  cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+      if @user and @user.terms_agreed?
+        # Already agreed to terms, so just show settings
+        redirect_to :action => :account, :display_name => @user.display_name
+      elsif @user.nil? and session[:new_user].nil?
+        redirect_to :action => :login, :referer => request.fullpath
+      end
+    end
+  end

 
   def save
     @title = t 'user.new.title'
 
 
   def save
     @title = t 'user.new.title'
 

-    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
-      render :action => 'new'
-    else
-      #The redirect from the OpenID provider reenters here again 
-      #and we need to pass the parameters through to the  
-      #open_id_authentication function a second time 
-      if params[:open_id_complete] 
-        openid_verify('', true) 
-        #We have set the user.openid_url to nil beforehand. If it hasn't 
-        #been set to a new valid openid_url, it means the openid couldn't be validated 
-        if @user.nil? or @user.openid_url.nil? 
-          render :action => 'new' 
-          return 
-        end   
-      else
-        @user = User.new(params[:user])
+    if params[:decline]
+      if @user
+        @user.terms_seen = true

 
 

-        @user.visible = true
-        @user.data_public = true
-        @user.description = "" if @user.description.nil?
-        @user.creation_ip = request.remote_ip
-        @user.languages = request.user_preferred_languages
-        #Set the openid_url to nil as for one it is used 
-        #to check if the openid could be validated and secondly 
-        #to not get dupplicate conflicts for an empty openid  
-        @user.openid_url = nil
-
-        if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
-          if (@user.pass_crypt.nil? or @user.pass_crypt.length == 0)
-            #if the password is empty, but we have a openid 
-            #then generate a random passowrd to disable 
-            #loging in via password 
-            @user.pass_crypt = ActiveSupport::SecureRandom.base64(16) 
-            @user.pass_crypt_confirmation = @user.pass_crypt 
-          end
-          #Validate all of the other fields before
-          #redirecting to the openid provider
-          if !@user.valid?
-            render :action => 'new'
-          else        
-            #TODO: Is it a problem to store the user variable with respect to password safty in the session variables?
-            #Store the user variable in the session for it to be accessible when redirecting back from the openid provider
-            session[:new_usr] = @user
-            begin
-              @norm_openid_url = OpenIdAuthentication.normalize_identifier(params[:user][:openid_url])
-            rescue
-              flash.now[:error] = t 'user.login.openid invalid'
-              render :action => 'new'
-              return
-            end
-            #Verify that the openid provided is valid and that the user is the owner of the id
-            openid_verify(@norm_openid_url, true)
-            #openid_verify can return in two ways:
-            #Either it returns with a redirect to the openid provider who then freshly
-            #redirects back to this url if the openid is valid, or if the openid is not plausible
-            #and no provider for it could be found it just returns
-            #we want to just let the redirect through
-            if response.headers["Location"].nil?
-              render :action => 'new'
-            end
-          end
-          #At this point there was either an error and the page has been rendered,
-          #or there is a redirect to the openid provider and the rest of the method
-          #gets executed whenn this method gets reentered after redirecting back
-          #from the openid provider
-          return
+        if @user.save
+          flash[:notice] = t 'user.new.terms declined', :url => t('user.new.terms declined url')

         end
         end

-      end

 
 

-      if @user.save
-        flash[:notice] = t 'user.new.flash create success message'
-        Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
-        redirect_to :action => 'login'
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => @user.display_name
+        end

       else
       else

-        render :action => 'new'
+        redirect_to t('user.terms.declined')

       end
       end

-    end
-  end
-
-  def account
-    @title = t 'user.account.title'
-    @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
-
-    #The redirect from the OpenID provider reenters here again
-    #and we need to pass the parameters through to the 
-    #open_id_authentication function
-    if params[:open_id_complete]
-      openid_verify('', false)
-      @user.save
-      return
-    end
-
-    if params[:user] and params[:user][:display_name] and params[:user][:description]
-      @user.display_name = params[:user][:display_name]
-      @user.new_email = params[:user][:new_email]
-
-      if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
-        @user.pass_crypt = params[:user][:pass_crypt]
-        @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+    elsif @user
+      if !@user.terms_agreed?
+        @user.consider_pd = params[:user][:consider_pd]
+        @user.terms_agreed = Time.now.getutc
+        @user.terms_seen = true
+        if @user.save
+          flash[:notice] = t 'user.new.terms accepted'
+        end

       end
 
       end
 

-      @user.description = params[:user][:description]
-      @user.languages = params[:user][:languages].split(",")
-
-      case params[:image_action]
-        when "new" then @user.image = params[:user][:image]
-        when "delete" then @user.image = nil
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :action => :account, :display_name => @user.display_name

       end
       end

+    else
+      @user = session.delete(:new_user)

 
 

-      @user.home_lat = params[:user][:home_lat]
-      @user.home_lon = params[:user][:home_lon]
-
-      @user.openid_url = nil if (params[:user][:openid_url].length == 0)
+      if check_signup_allowed(@user.email)
+        @user.data_public = true
+        @user.description = "" if @user.description.nil?
+        @user.creation_ip = request.remote_ip
+        @user.languages = http_accept_language.user_preferred_languages
+        @user.terms_agreed = Time.now.getutc
+        @user.terms_seen = true
+        @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?

 
 

-      if @user.save
-        set_locale
+        if @user.save
+          flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)

 
 

-        if @user.new_email.nil? or @user.new_email.empty?
-          flash.now[:notice] = t 'user.account.flash update success'
-        else
-          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+          referer = welcome_path

 
           begin
 
           begin

-            Notifier.deliver_email_confirm(@user, @user.tokens.create)
+            uri = URI(session[:referer])
+            /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m|
+              editor = Rack::Utils.parse_query(uri.query).slice('editor')
+              referer = welcome_path({'zoom' => m[1],
+                                      'lat' => m[2],
+                                      'lon' => m[3]}.merge(editor))
+            end

           rescue
           rescue

-            # Ignore errors sending email
+            # Use default

           end
           end

-        end
-      end

 
 

-      if (params[:user][:openid_url].length > 0)
-        begin
-          @norm_openid_url = OpenIdAuthentication.normalize_identifier(params[:user][:openid_url])
-          if (@norm_openid_url != @user.openid_url)
-            #If the OpenID has changed, we want to check that it is a valid OpenID and one
-            #the user has control over before saving the openID as a password equivalent for
-            #the user.
-            openid_verify(@norm_openid_url, false)
+          if @user.status == "active"
+            session[:referer] = referer
+            successful_login(@user)
+          else
+            session[:token] = @user.tokens.create.token
+            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now
+            redirect_to :action => 'confirm', :display_name => @user.display_name

           end
           end

-        rescue
-          flash.now[:error] = t 'user.login.openid invalid'
-        end
-      end
-
-    else
-      if flash[:errors]
-        flash[:errors].each do |attr,msg|
-          attr = "new_email" if attr == "email"
-          @user.errors.add(attr,msg)
+        else
+          render :action => 'new', :referer => params[:referer]

         end
       end
     end
   end
 
         end
       end
     end
   end
 

-  def openid_specialcase_mapping(openid_url)
-    #Special case gmail.com, as it is pontentially a popular OpenID provider and unlike
-    #yahoo.com, where it works automatically, Google have hidden their OpenID endpoint
-    #somewhere obscure making it less userfriendly.
-    if (openid_url.match(/(.*)gmail.com(\/?)$/) or openid_url.match(/(.*)googlemail.com(\/?)$/) )
-      return 'https://www.google.com/accounts/o8/id'
-    end
-
-    return nil
-  end  
+  def account
+    @title = t 'user.account.title'
+    @tokens = @user.oauth_tokens.authorized

 
 

-  def openid_verify(openid_url,account_create)
-    authenticate_with_open_id(openid_url) do |result, identity_url|
-      if result.successful?
-        #We need to use the openid url passed back from the OpenID provider
-        #rather than the one supplied by the user, as these can be different.
-        #e.g. one can simply enter yahoo.com in the login box, i.e. no user specific url
-        #only once it comes back from the OpenID provider do we know the unique address for
-        #the user.
-        @user = session[:new_usr] unless @user #this is used for account creation when the user is not yet in the database
-        @user.openid_url = identity_url
-      elsif result.missing?
-        mapped_id = openid_specialcase_mapping(openid_url)
-        if mapped_id
-          openid_verify(mapped_id, account_create)
-        else
-          flash.now[:error] = t 'user.login.openid missing provider'
-        end
-      elsif result.invalid?
-        flash.now[:error] = t 'user.login.openid invalid'
+    if params[:user] and params[:user][:display_name] and params[:user][:description]
+      if params[:user][:openid_url] and
+         params[:user][:openid_url].length > 0 and
+         params[:user][:openid_url] != @user.openid_url
+        # If the OpenID has changed, we want to check that it is a
+        # valid OpenID and one the user has control over before saving
+        # it as a password equivalent for the user.
+        session[:new_user_settings] = params
+        openid_verify(params[:user][:openid_url], @user)

       else
       else

-        flash.now[:error] = t 'user.login.auth failure'
+        update_user(@user, params)

       end
       end

-    end
-  end
-
-  def open_id_authentication(openid_url)
-    #TODO: only ask for nickname and email, if we don't already have a user for that openID, in which case
-    #email and nickname are already filled out. I don't know how to do that with ruby syntax though, as we
-    #don't want to duplicate the do block
-    #On the other hand it also doesn't matter too much if we ask every time, as the OpenID provider should
-    #remember these results, and shouldn't repromt the user for these data each time.
-    user = nil
-    authenticate_with_open_id(openid_url, :return_to => request.protocol + request.host_with_port + '/login?referer=' + params[:referer], :optional => [:nickname, :email]) do |result, identity_url, registration|
-      if result.successful?
-        #We need to use the openid url passed back from the OpenID provider
-        #rather than the one supplied by the user, as these can be different.
-        #e.g. one can simply enter yahoo.com in the login box, i.e. no user specific url
-        #only once it comes back from the OpenID provider do we know the unique address for
-        #the user.
-        user = User.find_by_openid_url(identity_url)
-        if user
-          if user.visible? and user.active?
-            session[:user] = user.id
-            session_expires_after 1.month if session[:remember]
-            return user
-          else
-            user = nil
-            flash.now[:error] = t 'user.login.account not active'
-          end
-        else
-          #We don't have a user registered to this OpenID. Redirect to the create account page
-          #with username and email filled in if they have been given by the OpenID provider through
-          #the simple registration protocol
-          redirect_to :controller => 'user', :action => 'new', :nickname => registration['nickname'], :email => registration['email'], :openid => identity_url
-        end
-      else if result.missing?
-             #Try and apply some heuristics to make common cases more userfriendly
-             mapped_id = openid_specialcase_mapping(openid_url)
-             if mapped_id
-               open_id_authentication(mapped_id)
-             else
-               flash.now[:error] = t 'user.login.openid missing provider'
-             end
-           else if result.invalid?
-                  flash.now[:error] = t 'user.login.openid invalid'
-                else
-                  flash.now[:error] = t 'user.login.auth failure'
-                end
-           end
+    elsif using_open_id?
+      # The redirect from the OpenID provider reenters here
+      # again and we need to pass the parameters through to
+      # the open_id_authentication function
+      settings = session.delete(:new_user_settings)
+      openid_verify(nil, @user) do |user|
+        update_user(user, settings)

       end
     end
       end
     end

-    return user

   end
 
   def go_public
   end
 
   def go_public


@@ -271,11 +153,19 @@ class UserController < ApplicationController
     @title = t 'user.lost_password.title'
 
     if params[:user] and params[:user][:email]
     @title = t 'user.lost_password.title'
 
     if params[:user] and params[:user][:email]

-      user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
+      user = User.visible.find_by_email(params[:user][:email])
+
+      if user.nil?
+        users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
+
+        if users.count == 1
+          user = users.first
+        end
+      end

 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.deliver_lost_password(user, token)
+        Notifier.lost_password(user, token).deliver_now

         flash[:notice] = t 'user.lost_password.notice email on way'
         redirect_to :action => 'login'
       else
         flash[:notice] = t 'user.lost_password.notice email on way'
         redirect_to :action => 'login'
       else


@@ -296,7 +186,7 @@ class UserController < ApplicationController
         if params[:user]
           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
         if params[:user]
           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]

-          @user.active = true
+          @user.status = "active" if @user.status == "pending"

           @user.email_valid = true
 
           if @user.save
           @user.email_valid = true
 
           if @user.save


@@ -309,65 +199,90 @@ class UserController < ApplicationController
         flash[:error] = t 'user.reset_password.flash token bad'
         redirect_to :action => 'lost_password'
       end
         flash[:error] = t 'user.reset_password.flash token bad'
         redirect_to :action => 'lost_password'
       end

+    else
+      render :text => "", :status => :bad_request

     end
   end
 
   def new
     @title = t 'user.new.title'
     end
   end
 
   def new
     @title = t 'user.new.title'

+    @referer = params[:referer] || session[:referer]

 
 

-    # The user is logged in already, so don't show them the signup
-    # page, instead send them to the home page
-    redirect_to :controller => 'site', :action => 'index' if session[:user]
+    if using_open_id?
+      # The redirect from the OpenID provider reenters here
+      # again and we need to pass the parameters through to
+      # the open_id_authentication function
+      @user = session.delete(:new_user)

 
 

-    @nickname = params['nickname']
-    @email = params['email']
-    @openID = params['openid']
-       
-    if !params['openid'].nil?
-         flash.now[:notice] = t 'user.new.openID association'
-       end
-  end
+      openid_verify(nil, @user) do |user, verified_email|
+        user.status = "active" if user.email == verified_email
+      end

 
 

-  def login
-    @title = t 'user.login.title'
-
-    #The redirect from the OpenID provider reenters here again
-    #and we need to pass the parameters through to the 
-    # open_id_authentication function
-    if params[:open_id_complete]
-      user = open_id_authentication('')
-    elsif params[:user]
-      if !params[:user][:openid_url].nil? and !params[:user][:openid_url].empty?
-        session[:remember] = params[:remember_me]
-        #construct the openid request. This will redirect to the OpenID server to ask for validation
-        #The external OpenID server will then redirect back to the login method and reenters at the top
-        open_id_authentication(params[:user][:openid_url])
-        return
+      if @user.openid_url.nil? or @user.invalid?
+        render :action => 'new'
+      else
+        session[:new_user] = @user
+        redirect_to :action => 'terms'
+      end
+    elsif @user
+      # The user is logged in already, so don't show them the signup
+      # page, instead send them to the home page
+      if @referer
+        redirect_to @referer

       else
       else

-        email_or_display_name = params[:user][:email]
-        pass = params[:user][:password]
+        redirect_to :controller => 'site', :action => 'index'
+      end
+    elsif params.key?(:openid)
+      @user = User.new(:email => params[:email],
+                       :email_confirmation => params[:email],
+                       :display_name => params[:nickname],
+                       :openid_url => params[:openid])

 
 

-        if user = User.authenticate(:username => email_or_display_name, :password => pass)
-          session[:user] = user.id
-          session_expires_after 1.month if params[:remember_me]
-        elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-          flash.now[:error] = t 'user.login.account not active'
-        else
-          flash.now[:error] = t 'user.login.auth failure'
-        end
+      flash.now[:notice] = t 'user.new.openid association'
+    else
+      check_signup_allowed
+    end
+  end
+
+  def create
+    @user = User.new(user_params)
+
+    if check_signup_allowed(@user.email)
+      session[:referer] = params[:referer]
+
+      @user.status = "pending"
+
+      if @user.openid_url.present? && @user.pass_crypt.empty?
+        # We are creating an account with OpenID and no password
+        # was specified so create a random one
+        @user.pass_crypt = SecureRandom.base64(16)
+        @user.pass_crypt_confirmation = @user.pass_crypt
+      end
+
+      if @user.invalid?
+        # Something is wrong with a new user, so rerender the form
+        render :action => "new"
+      elsif @user.openid_url.present?
+        # Verify OpenID before moving on
+        session[:new_user] = @user
+        openid_verify(@user.openid_url, @user)
+      else
+        # Save the user record
+        session[:new_user] = @user
+        redirect_to :action => :terms

       end
     end
       end
     end

+  end

 
 

-    if user
-      # The user is logged in, if the referer param exists, redirect
-      # them to that unless they've also got a block on them, in
-      # which case redirect them to the block so they can clear it.
-      if user.blocked_on_view
-        redirect_to user.blocked_on_view, :referrer => params[:referrer]
-      elsif params[:referer]
-        redirect_to params[:referer]
+  def login
+    if params[:username] or using_open_id?
+      session[:remember_me] ||= params[:remember_me]
+      session[:referer] ||= params[:referer]
+
+      if using_open_id?
+        openid_authentication(params[:openid_url])

       else
       else

-        redirect_to :controller => 'site', :action => 'index'
+        password_authentication(params[:username], params[:password])

       end
     end
   end
       end
     end
   end


@@ -381,9 +296,9 @@ class UserController < ApplicationController
         if token
           token.destroy
         end
         if token
           token.destroy
         end

-        session[:token] = nil
+        session.delete(:token)

       end
       end

-      session[:user] = nil
+      session.delete(:user)

       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]
       session_expires_automatically
       if params[:referer]
         redirect_to params[:referer]


@@ -394,36 +309,66 @@ class UserController < ApplicationController
   end
 
   def confirm
   end
 
   def confirm

-    if params[:confirm_action]
+    if request.post?

       token = UserToken.find_by_token(params[:confirm_string])
       token = UserToken.find_by_token(params[:confirm_string])

-      if token and !token.user.active?
-        @user = token.user
-        @user.active = true
-        @user.email_valid = true
-        @user.save!
+      if token && token.user.active?
+        flash[:error] = t('user.confirm.already active')
+        redirect_to :action => 'login'
+      elsif !token || token.expired?
+        flash[:error] = t('user.confirm.unknown token')
+        redirect_to :action => 'confirm'
+      else
+        user = token.user
+        user.status = "active"
+        user.email_valid = true
+        user.save!

         referer = token.referer
         token.destroy
         referer = token.referer
         token.destroy

-        flash[:notice] = t 'user.confirm.success'
-        session[:user] = @user.id
-        unless referer.nil?
-          redirect_to referer
+
+        if session[:token]
+          token = UserToken.find_by_token(session[:token])
+          session.delete(:token)

         else
         else

-          redirect_to :action => 'account', :display_name => @user.display_name
+          token = nil
+        end
+
+        if token.nil? or token.user != user
+          flash[:notice] = t('user.confirm.success')
+          redirect_to :action => :login, :referer => referer
+        else
+          token.destroy
+
+          session[:user] = user.id
+
+          redirect_to referer || welcome_path

         end
         end

-      else
-        flash.now[:error] = t 'user.confirm.failure'
+      end
+    else
+      user = User.find_by_display_name(params[:display_name])
+      if !user || user.active?
+        redirect_to root_path

       end
     end
   end
 
       end
     end
   end
 

+  def confirm_resend
+    if user = User.find_by_display_name(params[:display_name])
+      Notifier.signup_confirm(user, user.tokens.create).deliver_now
+      flash[:notice] = t 'user.confirm_resend.success', :email => user.email
+    else
+      flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
+    end
+
+    redirect_to :action => 'login'
+  end
+

   def confirm_email
   def confirm_email

-    if params[:confirm_action]
+    if request.post?

       token = UserToken.find_by_token(params[:confirm_string])
       if token and token.user.new_email?
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil
       token = UserToken.find_by_token(params[:confirm_string])
       if token and token.user.new_email?
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil

-        @user.active = true

         @user.email_valid = true
         if @user.save
           flash[:notice] = t 'user.confirm_email.success'
         @user.email_valid = true
         if @user.save
           flash[:notice] = t 'user.confirm_email.success'


@@ -434,11 +379,21 @@ class UserController < ApplicationController
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        flash.now[:error] = t 'user.confirm_email.failure'
+        flash[:error] = t 'user.confirm_email.failure'
+        redirect_to :action => 'account', :display_name => @user.display_name

       end
     end
   end
 
       end
     end
   end
 

+  def api_read
+    render :text => "", :status => :gone unless @this_user.visible?
+  end
+
+  def api_details
+    @this_user = @user
+    render :action => :api_read
+  end
+

   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     @user.traces.each do |trace|
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     @user.traces.each do |trace|


@@ -454,107 +409,413 @@ class UserController < ApplicationController
        (@this_user.visible? or (@user and @user.administrator?))
       @title = @this_user.display_name
     else
        (@this_user.visible? or (@user and @user.administrator?))
       @title = @this_user.display_name
     else

-      @title = t 'user.no_such_user.title'
-      @not_found_user = params[:display_name]
-      render :action => 'no_such_user', :status => :not_found
+      render_unknown_user params[:display_name]

     end
   end
 
   def make_friend
     end
   end
 
   def make_friend

-    if params[:display_name]
-      name = params[:display_name]
-      new_friend = User.find_by_display_name(name, :conditions => {:visible => true})
-      friend = Friend.new
-      friend.user_id = @user.id
-      friend.friend_user_id = new_friend.id
-      unless @user.is_friends_with?(new_friend)
-        if friend.save
-          flash[:notice] = t 'user.make_friend.success', :name => name
-          Notifier.deliver_friend_notification(friend)
+    @new_friend = User.find_by_display_name(params[:display_name])
+
+    if @new_friend
+      if request.post?
+        friend = Friend.new
+        friend.user_id = @user.id
+        friend.friend_user_id = @new_friend.id
+        unless @user.is_friends_with?(@new_friend)
+          if friend.save
+            flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
+            Notifier.friend_notification(friend).deliver_now
+          else
+            friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
+          end

         else
         else

-          friend.add_error(t('user.make_friend.failed', :name => name))
+          flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name

         end
         end

-      else
-        flash[:warning] = t 'user.make_friend.already_a_friend', :name => name
-      end

 
 

-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :controller => 'user', :action => 'view'
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :controller => 'user', :action => 'view'
+        end

       end
       end

+    else
+      render_unknown_user params[:display_name]

     end
   end
 
   def remove_friend
     end
   end
 
   def remove_friend

-    if params[:display_name]
-      name = params[:display_name]
-      friend = User.find_by_display_name(name, :conditions => {:visible => true})
-      if @user.is_friends_with?(friend)
-        Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
-        flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
+    @friend = User.find_by_display_name(params[:display_name])
+
+    if @friend
+      if request.post?
+        if @user.is_friends_with?(@friend)
+          Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}"
+          flash[:notice] = t 'user.remove_friend.success', :name => @friend.display_name
+        else
+          flash[:error] = t 'user.remove_friend.not_a_friend', :name => @friend.display_name
+        end
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :controller => 'user', :action => 'view'
+        end
+      end
+    else
+      render_unknown_user params[:display_name]
+    end
+  end
+
+  ##
+  # sets a user's status
+  def set_status
+    @this_user.status = params[:status]
+    @this_user.save
+    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  end
+
+  ##
+  # delete a user, marking them as deleted and removing personal data
+  def delete
+    @this_user.delete
+    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  end
+
+  ##
+  # display a list of users matching specified criteria
+  def list
+    if request.post?
+      ids = params[:user].keys.collect { |id| id.to_i }
+
+      User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
+      User.update_all("status = 'deleted'", :id => ids) if params[:hide]
+
+      redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
+    else
+      conditions = Hash.new
+      conditions[:status] = params[:status] if params[:status]
+      conditions[:creation_ip] = params[:ip] if params[:ip]
+
+      @user_pages, @users = paginate(:users,
+                                     :conditions => conditions,
+                                     :order => :id,
+                                     :per_page => 50)
+    end
+  end
+
+private
+
+  ##
+  # handle password authentication
+  def password_authentication(username, password)
+    if user = User.authenticate(:username => username, :password => password)
+      successful_login(user)
+    elsif user = User.authenticate(:username => username, :password => password, :pending => true)
+      unconfirmed_login(user)
+    elsif User.authenticate(:username => username, :password => password, :suspended => true)
+      failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
+    else
+      failed_login t('user.login.auth failure')
+    end
+  end
+
+  ##
+  # handle OpenID authentication
+  def openid_authentication(openid_url)
+    # If we don't appear to have a user for this URL then ask the
+    # provider for some extra information to help with signup
+    if openid_url and User.find_by_openid_url(openid_url)
+      required = nil
+    else
+      required = [:nickname, :email, "http://axschema.org/namePerson/friendly", "http://axschema.org/contact/email"]
+    end
+
+    # Start the authentication
+    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => required) do |result, identity_url, sreg, ax|
+      if result.successful?
+        # We need to use the openid url passed back from the OpenID provider
+        # rather than the one supplied by the user, as these can be different.
+        #
+        # For example, you can simply enter yahoo.com in the login box rather
+        # than a user specific url. Only once it comes back from the provider
+        # provider do we know the unique address for the user.
+        if user = User.find_by_openid_url(identity_url)
+          case user.status
+            when "pending" then
+              unconfirmed_login(user)
+            when "active", "confirmed" then
+              successful_login(user)
+            when "suspended" then
+              failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
+            else
+              failed_login t('user.login.auth failure')
+          end
+        else
+          # Guard against not getting any extension data
+          sreg = Hash.new if sreg.nil?
+          ax = Hash.new if ax.nil?
+
+          # We don't have a user registered to this OpenID, so redirect
+          # to the create account page with username and email filled
+          # in if they have been given by the OpenID provider through
+          # the simple registration protocol.
+          nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first
+          email = sreg["email"] || ax["http://axschema.org/contact/email"].first
+
+          redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url
+        end
+      elsif result.missing?
+        failed_login t('user.login.openid missing provider')
+      elsif result.invalid?
+        failed_login t('user.login.openid invalid')

       else
       else

-        flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
+        failed_login t('user.login.auth failure')

       end
       end

+    end
+  end

 
 

-      if params[:referer]
-        redirect_to params[:referer]
+  ##
+  # verify an OpenID URL
+  def openid_verify(openid_url, user)
+    user.openid_url = openid_url
+
+    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => [:email, "http://axschema.org/contact/email"]) do |result, identity_url, sreg, ax|
+      if result.successful?
+        # Do we trust the emails this provider returns?
+        if openid_email_verified(identity_url)
+          # Guard against not getting any extension data
+          sreg = Hash.new if sreg.nil?
+          ax = Hash.new if ax.nil?
+
+          # Get the verified email
+          verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first
+        end
+
+        # We need to use the openid url passed back from the OpenID provider
+        # rather than the one supplied by the user, as these can be different.
+        #
+        # For example, you can simply enter yahoo.com in the login box rather
+        # than a user specific url. Only once it comes back from the provider
+        # provider do we know the unique address for the user.
+        user.openid_url = identity_url
+        yield user, verified_email
+      elsif result.missing?
+        flash.now[:error] = t 'user.login.openid missing provider'
+      elsif result.invalid?
+        flash.now[:error] = t 'user.login.openid invalid'

       else
       else

-        redirect_to :controller => 'user', :action => 'view'
+        flash.now[:error] = t 'user.login.auth failure'

       end
     end
   end
 
   ##
       end
     end
   end
 
   ##

-  # activate a user, allowing them to log in
-  def activate
-    @this_user.update_attributes(:active => true)
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  # special case some common OpenID providers by applying heuristics to
+  # try and come up with the correct URL based on what the user entered
+  def openid_expand_url(openid_url)
+    if openid_url.nil?
+      return nil
+    elsif openid_url.match(/(.*)gmail.com(\/?)$/) or openid_url.match(/(.*)googlemail.com(\/?)$/)
+      # Special case gmail.com as it is potentially a popular OpenID
+      # provider and, unlike yahoo.com, where it works automatically, Google
+      # have hidden their OpenID endpoint somewhere obscure this making it
+      # somewhat less user friendly.
+      return 'https://www.google.com/accounts/o8/id'
+    else
+      return openid_url
+    end

   end
 
   ##
   end
 
   ##

-  # deactivate a user, preventing them from logging in
-  def deactivate
-    @this_user.update_attributes(:active => false)
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  # check if we trust an OpenID provider to return a verified
+  # email, so that we can skpi verifying it ourselves
+  def openid_email_verified(openid_url)
+    openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) or
+    openid_url.match(/https:\/\/me.yahoo.com\/(.*)/)

   end
 
   ##
   end
 
   ##

-  # hide a user, marking them as logically deleted
-  def hide
-    @this_user.update_attributes(:visible => false)
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  # process a successful login
+  def successful_login(user)
+    session[:user] = user.id
+    session_expires_after 28.days if session[:remember_me]
+
+    target = session[:referer] || url_for(:controller => :site, :action => :index)
+
+    # The user is logged in, so decide where to send them:
+    #
+    # - If they haven't seen the contributor terms, send them there.
+    # - If they have a block on them, show them that.
+    # - If they were referred to the login, send them back there.
+    # - Otherwise, send them to the home page.
+    if REQUIRE_TERMS_SEEN and not user.terms_seen
+      redirect_to :controller => :user, :action => :terms, :referer => target
+    elsif user.blocked_on_view
+      redirect_to user.blocked_on_view, :referer => target
+    else
+      redirect_to target
+    end
+
+    session.delete(:remember_me)
+    session.delete(:referer)

   end
 
   ##
   end
 
   ##

-  # unhide a user, clearing the logically deleted flag
-  def unhide
-    @this_user.update_attributes(:visible => true)
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  # process a failed login
+  def failed_login(message)
+    flash[:error] = message
+
+    redirect_to :action => 'login', :referer =>  session[:referer]
+
+    session.delete(:remember_me)
+    session.delete(:referer)

   end
 
   ##
   end
 
   ##

-  # delete a user, marking them as deleted and removing personal data
-  def delete
-    @this_user.delete
-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+  #
+  def unconfirmed_login(user)
+    redirect_to :action => 'confirm', :display_name => user.display_name
+
+    session.delete(:remember_me)
+    session.delete(:referer)

   end
   end

-private
+
+  ##
+  # update a user's details
+  def update_user(user, params)
+    user.display_name = params[:user][:display_name]
+    user.new_email = params[:user][:new_email]
+
+    if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
+      user.pass_crypt = params[:user][:pass_crypt]
+      user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+    end
+
+    if params[:user][:description] != user.description
+      user.description = params[:user][:description]
+      user.description_format = "markdown"
+    end
+
+    user.languages = params[:user][:languages].split(",")
+
+    case params[:image_action]
+    when "new" then
+      user.image = params[:user][:image]
+      user.image_use_gravatar = false
+    when "delete" then
+      user.image = nil
+      user.image_use_gravatar = false
+    when "gravatar" then
+      user.image = nil
+      user.image_use_gravatar = true
+    end
+
+    user.home_lat = params[:user][:home_lat]
+    user.home_lon = params[:user][:home_lon]
+
+    if params[:user][:preferred_editor] == "default"
+      user.preferred_editor = nil
+    else
+      user.preferred_editor = params[:user][:preferred_editor]
+    end
+
+    user.openid_url = nil if params[:user][:openid_url].blank?
+
+    if user.save
+      set_locale
+
+      if user.new_email.blank? or user.new_email == user.email
+        flash.now[:notice] = t 'user.account.flash update success'
+      else
+        user.email = user.new_email
+
+        if user.valid?
+          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+
+          begin
+            Notifier.email_confirm(user, user.tokens.create).deliver_now
+          rescue
+            # Ignore errors sending email
+          end
+        else
+          @user.errors.set(:new_email, @user.errors.get(:email))
+          @user.errors.set(:email, [])
+        end
+
+        user.restore_email!
+      end
+    end
+  end
+

   ##
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator
   ##
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator

-    unless @user.administrator?
+    if @user and not @user.administrator?

       flash[:error] = t('user.filter.not_an_administrator')
       flash[:error] = t('user.filter.not_an_administrator')

-      redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+
+      if params[:display_name]
+        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+      else
+        redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+      end
+    elsif not @user
+      redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+    end
+  end
+
+  ##
+  # require that the user in the URL is the logged in user
+  def require_self
+    if params[:display_name] != @user.display_name
+      render :text => "", :status => :forbidden

     end
   end
 
   ##
   # ensure that there is a "this_user" instance variable
     end
   end
 
   ##
   # ensure that there is a "this_user" instance variable

-  def lookup_this_user
+  def lookup_user_by_id
+    @this_user = User.find(params[:id])
+  end
+
+  ##
+  # ensure that there is a "this_user" instance variable
+  def lookup_user_by_name

     @this_user = User.find_by_display_name(params[:display_name])
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
     @this_user = User.find_by_display_name(params[:display_name])
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end

+
+  ##
+  #
+  def disable_terms_redirect
+    # this is necessary otherwise going to the user terms page, when
+    # having not agreed already would cause an infinite redirect loop.
+    # it's .now so that this doesn't propagate to other pages.
+    flash.now[:skip_terms] = true
+  end
+
+  ##
+  # return permitted user parameters
+  def user_params
+    params.require(:user).permit(:email, :email_confirmation, :display_name, :openid_url, :pass_crypt, :pass_crypt_confirmation)
+  end
+
+  ##
+  # check signup acls
+  def check_signup_allowed(email = nil)
+    if email.nil?
+      domain = nil
+    else
+      domain = email.split("@").last
+    end
+
+    if blocked = Acl.no_account_creation(request.remote_ip, domain)
+      logger.info "Blocked signup from #{request.remote_ip} for #{email}"
+
+      render :action => 'blocked'
+    end
+
+    not blocked
+  end

 end
 end