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

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6b50798313db59b7196e8466348bc99ae07f562d..7e22c63b4a56d75e33bacc376699d2aec248b721 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,23 +1,24 @@
 class UserController < ApplicationController
   layout "site", :except => [:api_details]
 
 class UserController < ApplicationController
   layout "site", :except => [:api_details]
 

-  skip_before_action :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files, :auth_success]
+  skip_before_action :verify_authenticity_token, :only => [:api_read, :api_users, :api_details, :api_gpx_files, :auth_success]

   before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_action :authorize, :only => [:api_details, :api_gpx_files]
   before_action :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_action :authorize, :only => [:api_details, :api_gpx_files]

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

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

-  before_action :check_database_readable, :except => [:login, :api_read, :api_details, :api_gpx_files]
+  before_action :check_database_readable, :except => [:login, :api_read, :api_users, :api_details, :api_gpx_files]

   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]
   before_action :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]

-  before_action :check_api_readable, :only => [:api_read, :api_details, :api_gpx_files]
+  before_action :check_api_readable, :only => [:api_read, :api_users, :api_details, :api_gpx_files]

   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :require_administrator, :only => [:set_status, :delete, :list]
   before_action :require_allow_read_prefs, :only => [:api_details]
   before_action :require_allow_read_gpx, :only => [:api_gpx_files]
   before_action :require_cookies, :only => [:new, :login, :confirm]
   before_action :require_administrator, :only => [:set_status, :delete, :list]

-  around_action :api_call_handle_error, :only => [:api_read, :api_details, :api_gpx_files]
+  around_action :api_call_handle_error, :only => [:api_read, :api_users, :api_details, :api_gpx_files]

   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]
   before_action :lookup_user_by_id, :only => [:api_read]
   before_action :lookup_user_by_name, :only => [:set_status, :delete]

+  before_action :allow_thirdparty_images, :only => [:view, :account]

 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE
 
   def terms
     @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE


@@ -28,10 +29,10 @@ class UserController < ApplicationController
     else
       @title = t "user.terms.title"
 
     else
       @title = t "user.terms.title"
 

-      if @user && @user.terms_agreed?
+      if current_user && current_user.terms_agreed?

         # Already agreed to terms, so just show settings
         # Already agreed to terms, so just show settings

-        redirect_to :action => :account, :display_name => @user.display_name
-      elsif @user.nil? && session[:new_user].nil?
+        redirect_to :action => :account, :display_name => current_user.display_name
+      elsif current_user.nil? && session[:new_user].nil?

         redirect_to :action => :login, :referer => request.fullpath
       end
     end
         redirect_to :action => :login, :referer => request.fullpath
       end
     end


@@ -41,52 +42,50 @@ class UserController < ApplicationController
     @title = t "user.new.title"
 
     if params[:decline]
     @title = t "user.new.title"
 
     if params[:decline]

-      if @user
-        @user.terms_seen = true
+      if current_user
+        current_user.terms_seen = true

 
 

-        if @user.save
-          flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe
-        end
+        flash[:notice] = t("user.new.terms declined", :url => t("user.new.terms declined url")).html_safe if current_user.save

 
         if params[:referer]
           redirect_to params[:referer]
         else
 
         if params[:referer]
           redirect_to params[:referer]
         else

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

         end
       else
         redirect_to t("user.terms.declined")
       end
         end
       else
         redirect_to t("user.terms.declined")
       end

-    elsif @user
-      unless @user.terms_agreed?
-        @user.consider_pd = params[:user][:consider_pd]
-        @user.terms_agreed = Time.now.getutc
-        @user.terms_seen = true
+    elsif current_user
+      unless current_user.terms_agreed?
+        current_user.consider_pd = params[:user][:consider_pd]
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true

 
 

-        flash[:notice] = t "user.new.terms accepted" if @user.save
+        flash[:notice] = t "user.new.terms accepted" if current_user.save

       end
 
       if params[:referer]
         redirect_to params[:referer]
       else
       end
 
       if params[:referer]
         redirect_to params[:referer]
       else

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

       end
     else
       end
     else

-      @user = session.delete(:new_user)
-
-      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
-
-        if @user.auth_uid.blank?
-          @user.auth_provider = nil
-          @user.auth_uid = nil
+      self.current_user = session.delete(:new_user)
+
+      if check_signup_allowed(current_user.email)
+        current_user.data_public = true
+        current_user.description = "" if current_user.description.nil?
+        current_user.creation_ip = request.remote_ip
+        current_user.languages = http_accept_language.user_preferred_languages
+        current_user.terms_agreed = Time.now.getutc
+        current_user.terms_seen = true
+
+        if current_user.auth_uid.blank?
+          current_user.auth_provider = nil
+          current_user.auth_uid = nil

         end
 
         end
 

-        if @user.save
+        if current_user.save

           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
           referer = welcome_path
           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
           referer = welcome_path


@@ -99,17 +98,17 @@ class UserController < ApplicationController
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end
                                        "lat" => m[2],
                                        "lon" => m[3] }.merge(editor))
             end

-          rescue
+          rescue StandardError

             # Use default
           end
 
             # Use default
           end
 

-          if @user.status == "active"
+          if current_user.status == "active"

             session[:referer] = referer
             session[:referer] = referer

-            successful_login(@user)
+            successful_login(current_user)

           else
           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
+            session[:token] = current_user.tokens.create.token
+            Notifier.signup_confirm(current_user, current_user.tokens.create(:referer => referer)).deliver_now
+            redirect_to :action => "confirm", :display_name => current_user.display_name

           end
         else
           render :action => "new", :referer => params[:referer]
           end
         else
           render :action => "new", :referer => params[:referer]


@@ -119,30 +118,30 @@ class UserController < ApplicationController
   end
 
   def account
   end
 
   def account

-    @title = t "user.account.title"
-    @tokens = @user.oauth_tokens.authorized
+    @tokens = current_user.oauth_tokens.authorized

 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
       if params[:user][:auth_provider].blank? ||
 
     if params[:user] && params[:user][:display_name] && params[:user][:description]
       if params[:user][:auth_provider].blank? ||

-         (params[:user][:auth_provider] == @user.auth_provider &&
-          params[:user][:auth_uid] == @user.auth_uid)
-        update_user(@user, params)
+         (params[:user][:auth_provider] == current_user.auth_provider &&
+          params[:user][:auth_uid] == current_user.auth_uid)
+        update_user(current_user, params)

       else
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
       end
     elsif errors = session.delete(:user_errors)
       errors.each do |attribute, error|
       else
         session[:new_user_settings] = params
         redirect_to auth_url(params[:user][:auth_provider], params[:user][:auth_uid])
       end
     elsif errors = session.delete(:user_errors)
       errors.each do |attribute, error|

-        @user.errors.add(attribute, error)
+        current_user.errors.add(attribute, error)

       end
     end
       end
     end

+    @title = t "user.account.title"

   end
 
   def go_public
   end
 
   def go_public

-    @user.data_public = true
-    @user.save
+    current_user.data_public = true
+    current_user.save

     flash[:notice] = t "user.go_public.flash success"
     flash[:notice] = t "user.go_public.flash success"

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

   end
 
   def lost_password
   end
 
   def lost_password


@@ -175,18 +174,18 @@ class UserController < ApplicationController
       token = UserToken.find_by(:token => params[:token])
 
       if token
       token = UserToken.find_by(:token => params[:token])
 
       if token

-        @user = token.user
+        self.current_user = token.user

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

-          @user.pass_crypt = params[:user][:pass_crypt]
-          @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
-          @user.status = "active" if @user.status == "pending"
-          @user.email_valid = true
+          current_user.pass_crypt = params[:user][:pass_crypt]
+          current_user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+          current_user.status = "active" if current_user.status == "pending"
+          current_user.email_valid = true

 
 

-          if @user.save
+          if current_user.save

             token.destroy
             flash[:notice] = t "user.reset_password.flash changed"
             token.destroy
             flash[:notice] = t "user.reset_password.flash changed"

-            successful_login(@user)
+            successful_login(current_user)

           end
         end
       else
           end
         end
       else


@@ -202,7 +201,11 @@ class UserController < ApplicationController
     @title = t "user.new.title"
     @referer = params[:referer] || session[:referer]
 
     @title = t "user.new.title"
     @referer = params[:referer] || session[:referer]
 

-    if @user
+    append_content_security_policy_directives(
+      :form_action => %w[accounts.google.com *.facebook.com login.live.com github.com meta.wikimedia.org]
+    )
+
+    if current_user

       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       if @referer
       # The user is logged in already, so don't show them the signup
       # page, instead send them to the home page
       if @referer


@@ -211,43 +214,45 @@ class UserController < ApplicationController
         redirect_to :controller => "site", :action => "index"
       end
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)
         redirect_to :controller => "site", :action => "index"
       end
     elsif params.key?(:auth_provider) && params.key?(:auth_uid)

-      @user = User.new(:email => params[:email],
-                       :email_confirmation => params[:email],
-                       :display_name => params[:nickname],
-                       :auth_provider => params[:auth_provider],
-                       :auth_uid => params[:auth_uid])
+      self.current_user = User.new(:email => params[:email],
+                                   :email_confirmation => params[:email],
+                                   :display_name => params[:nickname],
+                                   :auth_provider => params[:auth_provider],
+                                   :auth_uid => params[:auth_uid])

 
       flash.now[:notice] = render_to_string :partial => "auth_association"
     else
       check_signup_allowed
 
       flash.now[:notice] = render_to_string :partial => "auth_association"
     else
       check_signup_allowed

+
+      self.current_user = User.new

     end
   end
 
   def create
     end
   end
 
   def create

-    @user = User.new(user_params)
+    self.current_user = User.new(user_params)

 
 

-    if check_signup_allowed(@user.email)
+    if check_signup_allowed(current_user.email)

       session[:referer] = params[:referer]
 
       session[:referer] = params[:referer]
 

-      @user.status = "pending"
+      current_user.status = "pending"

 
 

-      if @user.auth_provider.present? && @user.pass_crypt.empty?
+      if current_user.auth_provider.present? && current_user.pass_crypt.empty?

         # We are creating an account with external authentication and
         # no password was specified so create a random one
         # We are creating an account with external authentication and
         # no password was specified so create a random one

-        @user.pass_crypt = SecureRandom.base64(16)
-        @user.pass_crypt_confirmation = @user.pass_crypt
+        current_user.pass_crypt = SecureRandom.base64(16)
+        current_user.pass_crypt_confirmation = current_user.pass_crypt

       end
 
       end
 

-      if @user.invalid?
+      if current_user.invalid?

         # Something is wrong with a new user, so rerender the form
         render :action => "new"
         # Something is wrong with a new user, so rerender the form
         render :action => "new"

-      elsif @user.auth_provider.present?
+      elsif current_user.auth_provider.present?

         # Verify external authenticator before moving on
         # Verify external authenticator before moving on

-        session[:new_user] = @user
-        redirect_to auth_url(@user.auth_provider, @user.auth_uid)
+        session[:new_user] = current_user
+        redirect_to auth_url(current_user.auth_provider, current_user.auth_uid)

       else
         # Save the user record
       else
         # Save the user record

-        session[:new_user] = @user
+        session[:new_user] = current_user

         redirect_to :action => :terms
       end
     end
         redirect_to :action => :terms
       end
     end


@@ -268,7 +273,7 @@ class UserController < ApplicationController
   def logout
     @title = t "user.logout.title"
 
   def logout
     @title = t "user.logout.title"
 

-    if params[:session] == request.session_options[:id]
+    if params[:session] == session.id

       if session[:token]
         token = UserToken.find_by(:token => session[:token])
         token.destroy if token
       if session[:token]
         token = UserToken.find_by(:token => session[:token])
         token.destroy if token


@@ -345,23 +350,23 @@ class UserController < ApplicationController
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])
       if token && token.user.new_email?
     if request.post?
       token = UserToken.find_by(:token => params[:confirm_string])
       if token && token.user.new_email?

-        @user = token.user
-        @user.email = @user.new_email
-        @user.new_email = nil
-        @user.email_valid = true
-        gravatar_enabled = gravatar_enable(@user)
-        if @user.save
+        self.current_user = token.user
+        current_user.email = current_user.new_email
+        current_user.new_email = nil
+        current_user.email_valid = true
+        gravatar_enabled = gravatar_enable(current_user)
+        if current_user.save

           flash[:notice] = if gravatar_enabled
           flash[:notice] = if gravatar_enabled

-                             t("user.confirm_email.success") + " " + gravatar_status_message(@user)
+                             t("user.confirm_email.success") + " " + gravatar_status_message(current_user)

                            else
                              t("user.confirm_email.success")
                            end
         else
                            else
                              t("user.confirm_email.success")
                            end
         else

-          flash[:errors] = @user.errors
+          flash[:errors] = current_user.errors

         end
         token.destroy
         end
         token.destroy

-        session[:user] = @user.id
-        redirect_to :action => "account", :display_name => @user.display_name
+        session[:user] = current_user.id
+        redirect_to :action => "account", :display_name => current_user.display_name

       elsif token
         flash[:error] = t "user.confirm_email.failure"
         redirect_to :action => "account", :display_name => token.user.display_name
       elsif token
         flash[:error] = t "user.confirm_email.failure"
         redirect_to :action => "account", :display_name => token.user.display_name


@@ -372,7 +377,7 @@ class UserController < ApplicationController
   end
 
   def api_read
   end
 
   def api_read

-    if @this_user.visible?
+    if @user.visible?

       render :action => :api_read, :content_type => "text/xml"
     else
       head :gone
       render :action => :api_read, :content_type => "text/xml"
     else
       head :gone


@@ -380,24 +385,36 @@ class UserController < ApplicationController
   end
 
   def api_details
   end
 
   def api_details

-    @this_user = @user
+    @user = current_user

     render :action => :api_read, :content_type => "text/xml"
   end
 
     render :action => :api_read, :content_type => "text/xml"
   end
 

+  def api_users
+    raise OSM::APIBadUserInput, "The parameter users is required, and must be of the form users=id[,id[,id...]]" unless params["users"]
+
+    ids = params["users"].split(",").collect(&:to_i)
+
+    raise OSM::APIBadUserInput, "No users were given to search for" if ids.empty?
+
+    @users = User.visible.find(ids)
+
+    render :action => :api_users, :content_type => "text/xml"
+  end
+

   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc

-    @user.traces.reload.each do |trace|
+    current_user.traces.reload.each do |trace|

       doc.root << trace.to_xml_node
     end
     render :xml => doc.to_s
   end
 
   def view
       doc.root << trace.to_xml_node
     end
     render :xml => doc.to_s
   end
 
   def view

-    @this_user = User.find_by(:display_name => params[:display_name])
+    @user = User.find_by(:display_name => params[:display_name])

 
 

-    if @this_user &&
-       (@this_user.visible? || (@user && @user.administrator?))
-      @title = @this_user.display_name
+    if @user &&
+       (@user.visible? || (current_user && current_user.administrator?))
+      @title = @user.display_name

     else
       render_unknown_user params[:display_name]
     end
     else
       render_unknown_user params[:display_name]
     end


@@ -409,9 +426,9 @@ class UserController < ApplicationController
     if @new_friend
       if request.post?
         friend = Friend.new
     if @new_friend
       if request.post?
         friend = Friend.new

-        friend.user_id = @user.id
-        friend.friend_user_id = @new_friend.id
-        if @user.is_friends_with?(@new_friend)
+        friend.befriender = current_user
+        friend.befriendee = @new_friend
+        if current_user.is_friends_with?(@new_friend)

           flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friend.save
           flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name
           flash[:warning] = t "user.make_friend.already_a_friend", :name => @new_friend.display_name
         elsif friend.save
           flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name


@@ -436,8 +453,8 @@ class UserController < ApplicationController
 
     if @friend
       if request.post?
 
     if @friend
       if request.post?

-        if @user.is_friends_with?(@friend)
-          Friend.where(:user_id => @user.id, :friend_user_id => @friend.id).delete_all
+        if current_user.is_friends_with?(@friend)
+          Friend.where(:user_id => current_user.id, :friend_user_id => @friend.id).delete_all

           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
           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


@@ -457,15 +474,15 @@ class UserController < ApplicationController
   ##
   # sets a user's status
   def set_status
   ##
   # sets a user's status
   def set_status

-    @this_user.status = params[:status]
-    @this_user.save
+    @user.status = params[:status]
+    @user.save

     redirect_to :action => "view", :display_name => params[:display_name]
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     redirect_to :action => "view", :display_name => params[:display_name]
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete

-    @this_user.delete
+    @user.delete

     redirect_to :action => "view", :display_name => params[:display_name]
   end
 
     redirect_to :action => "view", :display_name => params[:display_name]
   end
 


@@ -514,21 +531,19 @@ class UserController < ApplicationController
     end
 
     if settings = session.delete(:new_user_settings)
     end
 
     if settings = session.delete(:new_user_settings)

-      @user.auth_provider = provider
-      @user.auth_uid = uid
+      current_user.auth_provider = provider
+      current_user.auth_uid = uid

 
 

-      update_user(@user, settings)
+      update_user(current_user, settings)

 
 

-      session[:user_errors] = @user.errors.as_json
+      session[:user_errors] = current_user.errors.as_json

 
 

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

     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
 
     elsif session[:new_user]
       session[:new_user].auth_provider = provider
       session[:new_user].auth_uid = uid
 

-      if email_verified && email == session[:new_user].email
-        session[:new_user].status = "active"
-      end
+      session[:new_user].status = "active" if email_verified && email == session[:new_user].email

 
       redirect_to :action => "terms"
     else
 
       redirect_to :action => "terms"
     else


@@ -547,7 +562,7 @@ class UserController < ApplicationController
         when "active", "confirmed" then
           successful_login(user, request.env["omniauth.params"]["referer"])
         when "suspended" then
         when "active", "confirmed" then
           successful_login(user, request.env["omniauth.params"]["referer"])
         when "suspended" then

-          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}")
+          failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe

         else
           failed_login t("user.login.auth failure")
         end
         else
           failed_login t("user.login.auth failure")
         end


@@ -575,7 +590,7 @@ class UserController < ApplicationController
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     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:#{SUPPORT_EMAIL}"), username
+      failed_login t("user.login.account is suspended", :webmaster => "mailto:#{SUPPORT_EMAIL}").html_safe, username

     else
       failed_login t("user.login.auth failure"), username
     end
     else
       failed_login t("user.login.auth failure"), username
     end


@@ -709,7 +724,7 @@ class UserController < ApplicationController
     end
 
     if user.save
     end
 
     if user.save

-      set_locale
+      set_locale(true)

 
       if user.new_email.blank? || user.new_email == user.email
         flash.now[:notice] = t "user.account.flash update success"
 
       if user.new_email.blank? || user.new_email == user.email
         flash.now[:notice] = t "user.account.flash update success"


@@ -721,12 +736,12 @@ class UserController < ApplicationController
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now

-          rescue
+          rescue StandardError

             # Ignore errors sending email
           end
         else
             # Ignore errors sending email
           end
         else

-          @user.errors.set(:new_email, @user.errors.get(:email))
-          @user.errors.set(:email, [])
+          current_user.errors.add(:new_email, current_user.errors[:email])
+          current_user.errors.add(:email, [])

         end
 
         user.restore_email!
         end
 
         user.restore_email!


@@ -738,7 +753,7 @@ class UserController < ApplicationController
   # 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

-    if @user && !@user.administrator?
+    if current_user && !current_user.administrator?

       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]
       flash[:error] = t("user.filter.not_an_administrator")
 
       if params[:display_name]


@@ -746,7 +761,7 @@ class UserController < ApplicationController
       else
         redirect_to :action => "login", :referer => request.fullpath
       end
       else
         redirect_to :action => "login", :referer => request.fullpath
       end

-    elsif !@user
+    elsif !current_user

       redirect_to :action => "login", :referer => request.fullpath
     end
   end
       redirect_to :action => "login", :referer => request.fullpath
     end
   end


@@ -754,21 +769,21 @@ class UserController < ApplicationController
   ##
   # require that the user in the URL is the logged in user
   def require_self
   ##
   # require that the user in the URL is the logged in user
   def require_self

-    head :forbidden if params[:display_name] != @user.display_name
+    head :forbidden if params[:display_name] != current_user.display_name

   end
 
   ##
   end
 
   ##

-  # ensure that there is a "this_user" instance variable
+  # ensure that there is a "user" instance variable

   def lookup_user_by_id
   def lookup_user_by_id

-    @this_user = User.find(params[:id])
+    @user = User.find(params[:id])

   end
 
   ##
   end
 
   ##

-  # ensure that there is a "this_user" instance variable
+  # ensure that there is a "user" instance variable

   def lookup_user_by_name
   def lookup_user_by_name

-    @this_user = User.find_by(:display_name => params[:display_name])
+    @user = User.find_by(:display_name => params[:display_name])

   rescue ActiveRecord::RecordNotFound
   rescue ActiveRecord::RecordNotFound

-    redirect_to :action => "view", :display_name => params[:display_name] unless @this_user
+    redirect_to :action => "view", :display_name => params[:display_name] unless @user

   end
 
   ##
   end
 
   ##