applied TomH patch for lost password site

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 64e1e157de48085970360f2b2a6972e1ae065e68..cf1a176f1f6be64b081f66fbc3d30c446fb02986 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -53,7 +53,7 @@ class UserController < ApplicationController
   end
 
   def lost_password
   end
 
   def lost_password

-    if params[:user][:email]
+    if params[:user] and params[:user][:email]

       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token
       user = User.find_by_email(params['user']['email'])
       if user
         user.token = User.make_token


@@ -63,6 +63,8 @@ class UserController < ApplicationController
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end

+    else
+      render :action => 'lost_password'

     end
   end
 
     end
   end
 

diff --git a/config/routes.rb b/config/routes.rb
index 4f887d140c46beb761489da9bbb0708cda6ec20b..2420de1ca1ee5d2dfada78f52bd9d18635635157 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -44,6 +44,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
   map.connect '/user/save', :controller => 'user', :action => 'save'
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/go_public', :controller => 'user', :action => 'go_public'

+  map.connect '/user/reset_password', :controller => 'user', :action => 'reset_password'

   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'