various gpx rails things

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index d61455bf1671ad2a2de88da1ca76554a840f5cf3..2b695ce7a83cc1c22d8950a16a1dd85cb8455fe9 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,11 +1,12 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-
+  layout 'site'
+  

   def save
     @user = User.new(params[:user])
     @user.set_defaults
 
     if @user.save
   def save
     @user = User.new(params[:user])
     @user.set_defaults
 
     if @user.save

-      flash[:notice] = 'Users was successfully created.'
+      flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)'

       Notifier::deliver_signup_confirm(@user)
       redirect_to :action => 'login'
     else
       Notifier::deliver_signup_confirm(@user)
       redirect_to :action => 'login'
     else


@@ -13,8 +14,37 @@ class UserController < ApplicationController
     end
   end
 
     end
   end
 

+  def lost_password
+    if params['user']['email']
+      user = User.find_by_email(params['user']['email'])
+      if user
+        user.token = User.make_token
+        user.save
+        Notifier::deliver_lost_password(user)
+        flash[:notice] = "Sorry you lost it :-( but an email is on it's way so you can reset it soon."
+      else
+        flash[:notice] = "Couldn't find that email address, sorry."
+      end
+    end
+  end
+
+  def reset_password
+    if params['token']
+      user = User.find_by_token(params['token'])
+      if user
+        pass = User.make_token(8)
+        user.pass_crypt = pass
+        user.save
+        Notifier::deliver_reset_password(user, pass)
+        flash[:notice] = "You're password has been changed and is on the way to your mailbox :-)"
+      else
+        flash[:notice] = "Didn't find that token, check the URL maybe?"
+      end
+    end
+    redirect_to :action => 'login'
+  end
+

   def new
   def new

-    render :layout => 'site'

   end
 
   def login
   end
 
   def login


@@ -29,10 +59,10 @@ class UserController < ApplicationController
         session[:token] = u.token
         redirect_to :controller => 'site', :action => 'index'
         return
         session[:token] = u.token
         redirect_to :controller => 'site', :action => 'index'
         return

+      else
+        flash[:notice] = "Couldn't log in with those details"

       end
     end
       end
     end

-
-    render :layout => 'site'

   end
 
   def logout
   end
 
   def logout


@@ -53,7 +83,7 @@ class UserController < ApplicationController
     if @user && @user.active == 0
       @user.active = true
       @user.save
     if @user && @user.active == 0
       @user.active = true
       @user.save

-      flash[:notice] = 'Confirmed your account'
+      flash[:notice] = 'Confirmed your account, thanks for signing up!'

 
       #FIXME: login the person magically
 
 
       #FIXME: login the person magically