merged in changes from devel

[selectricity] / app / controllers / account_controller.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c13203b793283f6b34746f7acfb7f11c70345b87..c9388f6f52c542fc7e6081556ccdb5ae661282a8 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,5 @@
 class AccountController < ApplicationController
 class AccountController < ApplicationController

-  layout 'hc'
+  layout 'main'

   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem


@@ -10,8 +10,11 @@ class AccountController < ApplicationController
   def index
     redirect_to(:action => 'signup') unless logged_in? || User.count > 0
   end
   def index
     redirect_to(:action => 'signup') unless logged_in? || User.count > 0
   end

-
+  
+  #these methods provide basic functionality for the user login system
+  #===================================================================

   def login
   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?


@@ -19,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 => '/account', :action => 'index')
+      redirect_back_or_default(:controller => '/site', :action => 'index')

       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 => '/account', :action => 'index')
+    redirect_back_or_default(:controller => '/site', :action => 'index')

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


@@ -40,6 +47,16 @@ 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 => '/account', :action => 'index')
+    redirect_back_or_default(:controller => '/site', :action => 'index')
+  end
+  #======================================================================
+  
+  #The following methods are for slectricity specific uses
+  def summary
+    @user = User.find(params[:id])

   end
   end

+  
+  

 end
 end

+
+