added template left out from last committ by accident

[selectricity] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index e8adcf0fe809b8a466f38eb7161e5af765060104..6595b9b1144fb017a108233d683dadbd13fb0139 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -14,6 +14,7 @@ class AccountController < ApplicationController
   #these methods provide basic functionality for the user login system
   #===================================================================
   def login
   #these methods provide basic functionality for the user login system
   #===================================================================
   def login

+    

     return unless request.post?
     self.current_user = User.authenticate(params[:login], params[:password])
     if logged_in?
     return unless request.post?
     self.current_user = User.authenticate(params[:login], params[:password])
     if logged_in?


@@ -21,17 +22,21 @@ class AccountController < ApplicationController
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end
         self.current_user.remember_me
         cookies[:auth_token] = { :value => self.current_user.remember_token , :expires => self.current_user.remember_token_expires_at }
       end

-      redirect_back_or_default(:controller => '/site', :action => 'index')
+      redirect_back_or_default :controller => 'front'

       flash[:notice] = "Logged in successfully"
     end
   end
       flash[:notice] = "Logged in successfully"
     end
   end

+  
+  def forgot_password
+    raise "Not Implemented!"
+  end

 
   def signup
     @user = User.new(params[:user])
     return unless request.post?
     @user.save!
     self.current_user = @user
 
   def signup
     @user = User.new(params[:user])
     return unless request.post?
     @user.save!
     self.current_user = @user

-    redirect_back_or_default(:controller => '/site', :action => 'index')
+    redirect_back_or_default :controller => 'front'

     flash[:notice] = "Thanks for signing up!"
   rescue ActiveRecord::RecordInvalid
     render :action => 'signup'
     flash[:notice] = "Thanks for signing up!"
   rescue ActiveRecord::RecordInvalid
     render :action => 'signup'


@@ -42,7 +47,7 @@ class AccountController < ApplicationController
     cookies.delete :auth_token
     reset_session
     flash[:notice] = "You have been logged out."
     cookies.delete :auth_token
     reset_session
     flash[:notice] = "You have been logged out."

-    redirect_back_or_default(:controller => '/site', :action => 'index')
+    redirect_back_or_default :controller => 'front'

   end
   #======================================================================
   
   end
   #======================================================================