Upgrade to Rails 2

app/controllers/account_controller.rb

Index: app/controllers/account_controller.rb
===================================================================
--- app/controllers/account_controller.rb	(revision 36)
+++ app/controllers/account_controller.rb	(working copy)
@@ -5,16 +5,16 @@
   @@confirmation = '1bc7ac90bdd8e9f0121dcf99d83528b5'
 
   def login
-    case @request.method
+    case request.method
       when :post
-      if @session[:user] = User.authenticate(@params[:user_login], @params[:user_password])
-
+        logger.warn(" --> 1 session: #{session[:user]}")
+      if session[:user] = User.authenticate(params[:user_login], params[:user_password])
+        logger.warn(" --> 2 session: #{session[:user]}")
         flash[:notice]  = "Sign-in successful"
         redirect_back_or_default :action => "welcome"
       else
-        flash.now[:error]  = "Sign-in unsuccessful"
-
-        @login = @params[:user_login]
+        flash.now[:error] = "Sign-in unsuccessful"
+        @login = params[:user_login]
       end
     end
   end
@@ -25,18 +25,18 @@
       @menu_left = 'menu_left_admin_signup'
     end
     
-    @user = User.new(@params[:user])
+    @user = User.new(params[:user])
     @security = OpenStruct.new(params[:security])
-    if @request.post?
+    if request.post?
       if @admin_signup
         @user.admin = true
         if @user.save
-          @session[:user] = User.authenticate(@user.login, @params[:user][:password])
+          session[:user] = User.authenticate(@user.login, params[:user][:password])
           redirect_to :controller => 'welcome', :action => 'first_time_done'
         end
       elsif params[:security][:password] == Setting[:family_password]
         if @user.save
-          @session[:user] = User.authenticate(@user.login, @params[:user][:password])
+          session[:user] = User.authenticate(@user.login, params[:user][:password])
           flash[:notice]  = "Signup successful"
           redirect_back_or_default :action => "welcome"
         end
@@ -47,7 +47,7 @@
   end  
   
   def logout
-    @session[:user] = nil
+    session[:user] = nil
   end
     
   def welcome
@@ -109,7 +109,7 @@
   def forgot_password
     @security = OpenStruct.new(params[:security])    
     if request.post?
-      @user = User.find_by_email @security.email
+      @user = User.find_by_email(@security.email)
       if @user
         url = url_for({
                 :controller => 'account',