Added root elements and dict support for preferences response

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

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ca3726210040b54d0423faed59a21c7a38749641..e389f6fbf1a7cfd4f9f3763a7f712d13ebe136ea 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -280,6 +280,8 @@ class UsersController < ApplicationController
       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"
       elsif !token || token.expired?
         flash[:error] = t("users.confirm.unknown token")
         redirect_to :action => "confirm"

+      elsif !token.user.visible?
+        render_unknown_user token.user.display_name

       else
         user = token.user
         user.status = "active"
       else
         user = token.user
         user.status = "active"


@@ -309,14 +311,14 @@ class UsersController < ApplicationController
         end
       end
     else
         end
       end
     else

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

 
       redirect_to root_path if user.nil? || user.active?
     end
   end
 
   def confirm_resend
 
       redirect_to root_path if user.nil? || user.active?
     end
   end
 
   def confirm_resend

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

     token = UserToken.find_by(:token => session[:token])
 
     if user.nil? || token.nil? || token.user != user
     token = UserToken.find_by(:token => session[:token])
 
     if user.nil? || token.nil? || token.user != user