Use slim layout for OAuth pages too

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6d69b512011647f8bac599267299eb44e780d0ed..ed17c1e41ea04e32f32c7e47fe235bce83637659 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,33 +1,100 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site'
+  layout :choose_layout

 
   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, :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 :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
+  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_readable, :except => [:api_details, :api_gpx_files]

-  before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
+  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 :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
 
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 

+  cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete], :unless => STATUS == :database_offline
+
+  def terms
+    @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE
+    @text = OSM.legal_text_for_country(@legale)
+
+    if request.xhr?
+      render :update do |page|
+        page.replace_html "contributorTerms", :partial => "terms"
+      end
+    else
+      @title = t 'user.terms.title'
+      @user = User.new(params[:user]) if params[:user]
+
+      if @user
+        if @user.invalid?
+          if @user.new_record?
+            render :action => :new
+          else
+            flash[:errors] = @user.errors
+            redirect_to :action => :account, :display_name => @user.display_name
+          end
+        elsif @user.terms_agreed?
+          redirect_to :action => :account, :display_name => @user.display_name
+        end
+      else
+        redirect_to :action => :login, :referer => request.request_uri
+      end
+    end
+  end
+

   def save
     @title = t 'user.new.title'
 
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'
   def save
     @title = t 'user.new.title'
 
     if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
       render :action => 'new'

+    elsif params[:decline]
+      if @user
+        @user.terms_seen = true
+        @user.save
+
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :action => :account, :display_name => @user.display_name
+        end
+      else
+        redirect_to t('user.terms.declined')
+      end
+    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
+
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :action => :account, :display_name => @user.display_name
+      end

     else
       @user = User.new(params[:user])
 
     else
       @user = User.new(params[:user])
 

-      @user.visible = true
+      @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
       @user.data_public = true
       @user.description = "" if @user.description.nil?
       @user.creation_ip = request.remote_ip
       @user.languages = request.user_preferred_languages

-
+      @user.terms_agreed = Time.now.getutc
+      @user.terms_seen = true
+      

       if @user.save
       if @user.save

-        flash[:notice] = t 'user.new.flash create success message'
-        Notifier.deliver_signup_confirm(@user, @user.tokens.create)
+        flash[:notice] = t 'user.new.flash create success message', :email => @user.email
+        Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
+        session[:token] = @user.tokens.create.token

         redirect_to :action => 'login'
       else
         render :action => 'new'
         redirect_to :action => 'login'
       else
         render :action => 'new'


@@ -37,13 +104,11 @@ class UserController < ApplicationController
 
   def account
     @title = t 'user.account.title'
 
   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'

 
     if params[:user] and params[:user][:display_name] and params[:user][:description]
 
     if params[:user] and params[:user][:display_name] and params[:user][:description]

-      if params[:user][:email] != @user.email
-        @user.new_email = params[:user][:email]
-      end
-

       @user.display_name = params[:user][:display_name]
       @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]
 
       if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
         @user.pass_crypt = params[:user][:pass_crypt]


@@ -52,29 +117,44 @@ class UserController < ApplicationController
 
       @user.description = params[:user][:description]
       @user.languages = params[:user][:languages].split(",")
 
       @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
+      end
+

       @user.home_lat = params[:user][:home_lat]
       @user.home_lon = params[:user][:home_lon]
 
       @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
+

       if @user.save
         set_locale
 
       if @user.save
         set_locale
 

-        if params[:user][:email] == @user.new_email
-          flash[:notice] = t 'user.account.flash update success confirm needed'
-          Notifier.deliver_email_confirm(@user, @user.tokens.create)
-        else
+        if @user.new_email.nil? or @user.new_email.empty?

           flash[:notice] = t 'user.account.flash update success'
           flash[:notice] = t 'user.account.flash update success'

+        else
+          flash[: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

-      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
-      if @user.save
-        flash[:notice] = t 'user.set_home.flash success'
-        redirect_to :controller => 'user', :action => 'account'
+        redirect_to :action => "account", :display_name => @user.display_name
+      end
+    else
+      if flash[:errors]
+        flash[:errors].each do |attr,msg|
+          attr = "new_email" if attr == "email" and !@user.new_email.nil?
+          @user.errors.add(attr,msg)
+        end

       end
     end
   end
       end
     end
   end


@@ -90,14 +170,15 @@ 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.find_by_email(params[:user][:email], :conditions => {:status => ["pending", "active", "confirmed"]})

 
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
 
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)

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

       else
       else

-        @notice = t 'user.lost_password.notice email cannot find'
+        flash.now[:error] = t 'user.lost_password.notice email cannot find'

       end
     end
   end
       end
     end
   end


@@ -109,11 +190,12 @@ class UserController < ApplicationController
       token = UserToken.find_by_token(params[:token])
 
       if token
       token = UserToken.find_by_token(params[:token])
 
       if token

+        @user = token.user
+

         if params[:user]
         if params[:user]

-          @user = token.user

           @user.pass_crypt = params[:user][:pass_crypt]
           @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
           @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


@@ -123,7 +205,7 @@ class UserController < ApplicationController
           end
         end
       else
           end
         end
       else

-        flash[:notice] = t 'user.reset_password.flash token bad'
+        flash[:error] = t 'user.reset_password.flash token bad'

         redirect_to :action => 'lost_password'
       end
     end
         redirect_to :action => 'lost_password'
       end
     end


@@ -132,114 +214,160 @@ class UserController < ApplicationController
   def new
     @title = t 'user.new.title'
 
   def new
     @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
+    # 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
     redirect_to :controller => 'site', :action => 'index' if session[:user]
   end
 
   def login

-    if session[:user]
-      # The user is logged in already, if the referer param exists, redirect them to that
-      if params[:referer]
-        redirect_to params[:referer]
-      else
-        redirect_to :controller => 'site', :action => 'index'
-      end
-      return
-    end
-

     @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)
     @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 user
         session[:user] = user.id

-        if params[:referer]
-          redirect_to params[:referer]
+        session_expires_after 1.month if params[:remember_me]
+
+        target = params[: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
         else

-          redirect_to :controller => 'site', :action => 'index'
+          redirect_to target

         end
         end

-        return
-      elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        @notice = t 'user.login.account not active'
+      elsif user = User.authenticate(:username => email_or_display_name, :password => pass, :pending => true)
+        flash.now[:error] = t 'user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name)
+      elsif User.authenticate(:username => email_or_display_name, :password => pass, :suspended => true)
+        webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
+        flash.now[:error] = t 'user.login.account suspended', :webmaster => webmaster

       else
       else

-        @notice = t 'user.login.auth failure'
+        flash.now[:error] = t 'user.login.auth failure'

       end
       end

+    elsif flash[:notice].nil?
+      flash.now[:notice] =  t 'user.login.notice'

     end
   end
 
   def logout
     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
       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
     end
   end
 
   def confirm

-    if params[:confirm_action]
-      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!
-        token.destroy
-        flash[:notice] = t 'user.confirm.success'
-        session[:user] = @user.id
-        redirect_to :action => 'account', :display_name => @user.display_name
+    if request.post?
+      if token = UserToken.find_by_token(params[:confirm_string])
+        if token.user.active?
+          flash[:error] = t('user.confirm.already active')
+          redirect_to :action => 'login'
+        else
+          user = token.user
+          user.status = "active"
+          user.email_valid = true
+          user.save!
+          referer = token.referer
+          token.destroy
+
+          if session[:token] 
+            token = UserToken.find_by_token(session[:token])
+            session.delete(:token)
+          else
+            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
+
+            if referer.nil?
+              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
+              redirect_to :action => :account, :display_name => user.display_name
+            else
+              flash[:notice] = t('user.confirm.success')
+              redirect_to referer
+            end
+          end
+        end

       else
       else

-        @notice = t 'user.confirm.failure'
+        user = User.find_by_display_name(params[:display_name])
+
+        if user and user.active?
+          flash[:error] = t('user.confirm.already active')
+        elsif user
+          flash[:error] = t('user.confirm.unknown token') + t('user.confirm.reconfirm', :reconfirm => url_for(:action => 'confirm_resend', :display_name => params[:display_name]))
+        else
+          flash[:error] = t('user.confirm.unknown token')
+        end
+
+        redirect_to :action => 'login'

       end
     end
   end
 
       end
     end
   end
 

+  def confirm_resend
+    if user = User.find_by_display_name(params[:display_name])
+      Notifier.deliver_signup_confirm(user, user.tokens.create)
+      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
         @user.email_valid = true

-        @user.save!
+        if @user.save
+          flash[:notice] = t 'user.confirm_email.success'
+        else
+          flash[:errors] = @user.errors
+        end

         token.destroy
         token.destroy

-        flash[:notice] = t 'user.confirm_email.success'

         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

-        @notice = 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 upload_image
-    @user.image = params[:user][:image]
-    @user.save!
-    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
-  end
-
-  def delete_image
-    @user.image = nil
-    @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"
-  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|


@@ -249,9 +377,10 @@ class UserController < ApplicationController
   end
 
   def view
   end
 
   def view

-    @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})
+    @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'
       @title = @this_user.display_name
     else
       @title = t 'user.no_such_user.title'


@@ -261,9 +390,9 @@ class UserController < ApplicationController
   end
 
   def make_friend
   end
 
   def make_friend

-    if params[:display_name]     
+    if params[:display_name]

       name = params[:display_name]
       name = params[:display_name]

-      new_friend = User.find_by_display_name(name, :conditions => {:visible => true})
+      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
       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id


@@ -275,25 +404,109 @@ class UserController < ApplicationController
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else

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

       end
 
       end
 

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

     end
   end
 
   def remove_friend
     end
   end
 
   def remove_friend

-    if params[:display_name]     
+    if params[:display_name]

       name = params[:display_name]
       name = params[:display_name]

-      friend = User.find_by_display_name(name, :conditions => {:visible => true})
+      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] = t 'user.remove_friend.success', :name => friend.display_name
       else
       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[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
+        flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name

       end
 
       end
 

-      redirect_to :controller => 'user', :action => 'view'
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        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]
+
+      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
+
+  ##
+  # 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
+
+  ##
+  # Choose the layout to use. See
+  # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
+  def choose_layout
+    if [ 'api_details' ].include? action_name
+      nil
+    elsif [ 'login', 'new', 'terms'].include? action_name
+      'slim'
+    else
+      'site'

     end
   end
 end
     end
   end
 end