Always get the bug commenter name from the user if there is one

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9551ac6d8fbdd1e21524a6d1f7065f079c7618b9..97b0de73c79fdf4d85676069df17a816a6989fd3 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,6 +1,7 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site', :except => :api_details
+  layout :choose_layout

 
 

+  before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]

   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]


@@ -11,33 +12,96 @@ class UserController < ApplicationController
   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_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]
+  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, :hide, :unhide, :delete]
+  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
+
+        if @user.save
+          flash[:notice] = t 'user.new.terms declined', :url => t('user.new.terms declined url')
+        end
+
+        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'
+        flash[:notice] = t 'user.new.flash create success message', :email => @user.email

         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))

-        redirect_to :action => 'login'
+        session[:token] = @user.tokens.create.token
+        redirect_to :action => 'login', :referer => params[:referer]

       else
       else

-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]

       end
     end
   end
       end
     end
   end


@@ -66,13 +130,19 @@ class UserController < ApplicationController
       @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.new_email.nil? or @user.new_email.empty?
       if @user.save
         set_locale
 
         if @user.new_email.nil? or @user.new_email.empty?

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

         else
         else

-          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+          flash[:notice] = t 'user.account.flash update success confirm needed'

 
           begin
             Notifier.deliver_email_confirm(@user, @user.tokens.create)
 
           begin
             Notifier.deliver_email_confirm(@user, @user.tokens.create)


@@ -80,11 +150,13 @@ class UserController < ApplicationController
             # Ignore errors sending email
           end
         end
             # Ignore errors sending email
           end
         end

+
+        redirect_to :action => "account", :display_name => @user.display_name

       end
     else
       if flash[:errors]
         flash[:errors].each do |attr,msg|
       end
     else
       if flash[:errors]
         flash[:errors].each do |attr,msg|

-          attr = "new_email" if attr == "email"
+          attr = "new_email" if attr == "email" and !@user.new_email.nil?

           @user.errors.add(attr,msg)
         end
       end
           @user.errors.add(attr,msg)
         end
       end


@@ -102,7 +174,7 @@ 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
 
       if user
         token = user.tokens.create


@@ -127,7 +199,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


@@ -163,21 +235,31 @@ class UserController < ApplicationController
         session[:user] = user.id
         session_expires_after 1.month if params[:remember_me]
 
         session[:user] = user.id
         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]
+        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

-       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
-        flash.now[:error] = 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
         flash.now[:error] = t 'user.login.auth failure'
       end
       else
         flash.now[:error] = t 'user.login.auth failure'
       end

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

     end
   end
 
     end
   end
 


@@ -203,36 +285,77 @@ class UserController < ApplicationController
   end
 
   def confirm
   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!
-        referer = token.referer
-        token.destroy
-        flash[:notice] = t 'user.confirm.success'
-        session[:user] = @user.id
-        unless referer.nil?
-          redirect_to referer
+    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
         else

-          redirect_to :action => 'account', :display_name => @user.display_name
+          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
         end
       else

-        flash.now[:error] = 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
         if @user.save
           flash[:notice] = t 'user.confirm_email.success'
         @user.email_valid = true
         if @user.save
           flash[:notice] = t 'user.confirm_email.success'


@@ -243,7 +366,8 @@ 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


@@ -272,7 +396,7 @@ class UserController < ApplicationController
   def make_friend
     if params[:display_name]
       name = params[:display_name]
   def make_friend
     if 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


@@ -298,7 +422,7 @@ class UserController < ApplicationController
   def remove_friend
     if params[:display_name]
       name = params[:display_name]
   def remove_friend
     if 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
       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


@@ -315,47 +439,57 @@ class UserController < ApplicationController
   end
 
   ##
   end
 
   ##

-  # activate a user, allowing them to log in
-  def activate
-    @this_user.update_attributes(:active => true)
+  # 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
 
   ##
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
   end
 
   ##

-  # deactivate a user, preventing them from logging in
-  def deactivate
-    @this_user.update_attributes(:active => false)
+  # 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
 
   ##
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
   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]
-  end
+  # display a list of users matching specified criteria
+  def list
+    if request.post?
+      ids = params[:user].keys.collect { |id| id.to_i }

 
 

-  ##
-  # 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]
-  end
+      User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
+      User.update_all("status = 'deleted'", :id => ids) if params[:hide]

 
 

-  ##
-  # 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]
+      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
   end

+

 private
 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
   ##
   # 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.request_uri
+      end
+    elsif not @user
+      redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri

     end
   end
 
     end
   end
 


@@ -366,4 +500,28 @@ private
   rescue ActiveRecord::RecordNotFound
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
   end
   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
+    oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+
+    if [ 'api_details' ].include? action_name
+      nil
+    elsif params[:referer] and URI.parse(params[:referer]).path == oauth_url
+      'slim'
+    else
+      'site'
+    end
+  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

 end
 end