X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4b3c207a818b936310f48b768488a6a39845fe81..ae8c0b3baff821423ef4830abab075ffb8f4ead9:/app/controllers/user_controller.rb?ds=inline

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index e998e83c6..e5db74f38 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,57 +1,92 @@
 class UserController < ApplicationController
-  layout 'site'
+  layout 'site', :except => :api_details
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image]
-  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image]
+  before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
+  before_filter :set_locale, :except => [:api_details, :api_gpx_files]
+  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_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 => [:set_status, :delete, :list]
+  before_filter :lookup_this_user, :only => [:set_status, :delete]
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
+  cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
+
   def save
-    @title = 'create account'
-    @user = User.new(params[:user])
+    @title = t 'user.new.title'
 
-    @user.data_public = true
-      
-    if @user.save
-      token = @user.tokens.create
-      flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."
-      Notifier::deliver_signup_confirm(@user, token)
-      redirect_to :action => 'login'
-    else
+    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
+    else
+      @user = User.new(params[:user])
+
+      @user.status = "pending"
+      @user.data_public = true
+      @user.description = "" if @user.description.nil?
+      @user.creation_ip = request.remote_ip
+      @user.languages = request.user_preferred_languages
+
+      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'
+      else
+        render :action => 'new'
+      end
     end
   end
 
   def account
-    @title = 'edit account'
-    if params[:user] and params[:user][:display_name] and params[:user][:description]
-      home_lat =  params[:user][:home_lat]
-      home_lon =  params[:user][:home_lon]
+    @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'
 
+    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]
       end
+
       @user.description = params[:user][:description]
-      @user.home_lat = home_lat
-      @user.home_lon = home_lon
-      if @user.save
-        flash[:notice] = "User information updated successfully."
-      else
-        flash.delete(:notice)
+      @user.languages = params[:user][:languages].split(",")
+
+      case params[:image_action]
+        when "new" then @user.image = params[:user][:image]
+        when "delete" then @user.image = nil
       end
-    end
-  end
 
-  def set_home
-    if params[:user][:home_lat] and params[:user][:home_lon]
-      @user.home_lat = params[:user][:home_lat].to_f
-      @user.home_lon = params[:user][:home_lon].to_f
+      @user.home_lat = params[:user][:home_lat]
+      @user.home_lon = params[:user][:home_lon]
+
       if @user.save
-        flash[:notice] = "Home location saved successfully."
-        redirect_to :controller => 'user', :action => 'account'
+        set_locale
+
+        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'
+
+          begin
+            Notifier.deliver_email_confirm(@user, @user.tokens.create)
+          rescue
+            # Ignore errors sending email
+          end
+        end
+      end
+    else
+      if flash[:errors]
+        flash[:errors].each do |attr,msg|
+          attr = "new_email" if attr == "email"
+          @user.errors.add(attr,msg)
+        end
       end
     end
   end
@@ -59,112 +94,159 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
-    flash[:notice] = 'All your edits are now public.'
+    flash[:notice] = t 'user.go_public.flash success'
     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
-    @title = 'lost password'
+    @title = t 'user.lost_password.title'
+
     if params[:user] and params[:user][:email]
-      user = User.find_by_email(params[:user][:email])
+      user = User.find_by_email(params[:user][:email], :conditions => {:status => ["pending", "active", "confirmed"]})
+
       if user
         token = user.tokens.create
-        Notifier::deliver_lost_password(user, token)
-        flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
+        Notifier.deliver_lost_password(user, token)
+        flash[:notice] = t 'user.lost_password.notice email on way'
+        redirect_to :action => 'login'
       else
-        flash[:notice] = "Couldn't find that email address, sorry."
+        flash.now[:error] = t 'user.lost_password.notice email cannot find'
       end
-    else
-      render :action => 'lost_password'
     end
   end
 
   def reset_password
-    @title = 'reset password'
-    if params['token']
+    @title = t 'user.reset_password.title'
+
+    if params[:token]
       token = UserToken.find_by_token(params[:token])
+
       if token
-        pass = OSM::make_token(8)
-        user = token.user
-        user.pass_crypt = pass
-        user.pass_crypt_confirmation = pass
-        user.active = true
-        user.save!
-        token.destroy
-        Notifier::deliver_reset_password(user, pass)
-        flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
+        @user = token.user
+
+        if params[:user]
+          @user.pass_crypt = params[:user][:pass_crypt]
+          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+          @user.status = "active"
+          @user.email_valid = true
+
+          if @user.save
+            token.destroy
+            flash[:notice] = t 'user.reset_password.flash changed'
+            redirect_to :action => 'login'
+          end
+        end
       else
-        flash[:notice] = "Didn't find that token, check the URL maybe?"
+        flash[:error] = t 'user.reset_password.flash token bad'
+        redirect_to :action => 'lost_password'
       end
     end
-    redirect_to :action => 'login'
   end
 
   def new
-    @title = 'create account'
+    @title = t 'user.new.title'
+
+    # 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]
   end
 
   def login
-    @title = 'login'
+    @title = t 'user.login.title'
+
     if params[:user]
       email_or_display_name = params[:user][:email]
       pass = params[:user][:password]
       user = User.authenticate(:username => email_or_display_name, :password => pass)
+
       if user
         session[:user] = user.id
-        if params[:referer]
+        session_expires_after 1.month if params[:remember_me]
+
+        # 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]
         else
           redirect_to :controller => 'site', :action => 'index'
         end
-        return
-      elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      elsif User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
+        flash.now[:error] = t 'user.login.account not active'
+      elsif User.authenticate(:username => email_or_display_name, :password => pass, :suspended => true)
+        flash.now[:error] = t 'user.login.account suspended'
       else
-        flash[:notice] = "Sorry, couldn't log in with those details."
+        flash.now[:error] = t 'user.login.auth failure'
       end
     end
   end
 
   def logout
-    if session[:token]
-      token = UserToken.find_by_token(session[:token])
-      if token
-        token.destroy
+    @title = t 'user.logout.title'
+
+    if params[:session] == request.session_options[:id]
+      if session[:token]
+        token = UserToken.find_by_token(session[:token])
+        if token
+          token.destroy
+        end
+        session[:token] = nil
+      end
+      session[:user] = nil
+      session_expires_automatically
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'site', :action => 'index'
       end
-      session[:token] = nil
-    end
-    session[:user] = nil
-    if params[:referer]
-      redirect_to params[:referer]
-    else
-      redirect_to :controller => 'site', :action => 'index'
     end
   end
 
   def confirm
-    token = UserToken.find_by_token(params[:confirm_string])
-    if token and !token.user.active?
-      @user = token.user
-      @user.active = true
-      @user.save!
-      token.destroy
-      flash[:notice] = 'Confirmed your account, thanks for signing up!'
-      session[:user] = @user.id
-      redirect_to :action => 'account', :display_name => @user.display_name
-    else
-      flash[:notice] = 'Something went wrong confirming that user.'
+    if params[:confirm_action]
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token and !token.user.active?
+        @user = token.user
+        @user.status = "active"
+        @user.email_valid = true
+        @user.save!
+        referer = token.referer
+        token.destroy
+        flash[:notice] = t 'user.confirm.success'
+        session[:user] = @user.id
+        unless referer.nil?
+          redirect_to referer
+        else
+          redirect_to :action => 'account', :display_name => @user.display_name
+        end
+      else
+        flash.now[:error] = t 'user.confirm.failure'
+      end
     end
   end
 
-  def upload_image
-    @user.image = params[:user][:image]
-    @user.save!
-    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
-  end
-
-  def api_details
-    render :text => @user.to_xml.to_s, :content_type => "text/xml"
+  def confirm_email
+    if params[:confirm_action]
+      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.email_valid = true
+        if @user.save
+          flash[:notice] = t 'user.confirm_email.success'
+        else
+          flash[:errors] = @user.errors
+        end
+        token.destroy
+        session[:user] = @user.id
+        redirect_to :action => 'account', :display_name => @user.display_name
+      else
+        flash.now[:error] = t 'user.confirm_email.failure'
+      end
+    end
   end
 
   def api_gpx_files
@@ -178,48 +260,119 @@ class UserController < ApplicationController
   def view
     @this_user = User.find_by_display_name(params[:display_name])
 
-    if @this_user
+    if @this_user and
+       (@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
     end
   end
 
   def make_friend
-    if params[:display_name]     
+    if params[:display_name]
       name = params[:display_name]
-      new_friend = User.find_by_display_name(name)
+      new_friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
       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] = "#{name} is now your friend."
-          Notifier::deliver_friend_notification(friend)
+          flash[:notice] = t 'user.make_friend.success', :name => name
+          Notifier.deliver_friend_notification(friend)
         else
-          friend.add_error("Sorry, failed to add #{name} as a friend.")
+          friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else
-        flash[:notice] = "You are already friends with #{name}."  
+        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'
       end
-      redirect_to :controller => 'user', :action => 'view'
     end
   end
 
   def remove_friend
-    if params[:display_name]     
+    if params[:display_name]
       name = params[:display_name]
-      friend = User.find_by_display_name(name)
+      friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
-        flash[:notice] = "#{friend.display_name} was removed from your friends."
+        flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       else
-        flash[:notice] = "#{friend.display_name} was not already one of your friends."
+        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
-      redirect_to :controller => 'user', :action => 'view'
     end
   end
 
-end
+  ##
+  # sets a user's status
+  def set_status
+    @this_user.update_attributes(:status => params[:status])
+    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]
+    end
+
+    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
 
+private
+
+  ##
+  # require that the user is a administrator, or fill out a helpful error message
+  # and return them to the user page.
+  def require_administrator
+    if @user and not @user.administrator?
+      flash[:error] = t('user.filter.not_an_administrator')
+
+      if params[:display_name]
+        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+      else
+        redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+      end
+    elsif not @user
+      redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+    end
+  end
+
+  ##
+  # ensure that there is a "this_user" instance variable
+  def lookup_this_user
+    @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
+end