Change the gps_points table to store latitude and longitude values to

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9a1d89da6222213eef1c55108adcdd77b27e4807..e69ce313723431055e57b2e70a7c722b78251632 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,35 +1,44 @@
 class UserController < ApplicationController
   layout 'site'
 
 class UserController < ApplicationController
   layout 'site'
 

-  before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
-  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary, :make_friend]
-  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public, :make_friend]
+  before_filter :authorize, :only => [:api_details, :api_gpx_files]
+  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend]
+  before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend]
+
+  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation

 
   def save
 
   def save

+    @title = 'create account'

     @user = User.new(params[:user])
     @user = User.new(params[:user])

-    @user.set_defaults

 
     if @user.save
 
     if @user.save

-      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)
+      token = @user.tokens.create
+      flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."
+      Notifier::deliver_signup_confirm(@user, token)

       redirect_to :action => 'login'
     else
       render :action => 'new'
     end
   end
 
       redirect_to :action => 'login'
     else
       render :action => 'new'
     end
   end
 

-  def edit
+  def account
+    @title = 'edit account'

     if params[:user] and params[:user][:display_name] and params[:user][:description]
       home_lat =  params[:user][:home_lat]
       home_lon =  params[:user][:home_lon]
 
       @user.display_name = params[:user][:display_name]
     if params[:user] and params[:user][:display_name] and params[:user][:description]
       home_lat =  params[:user][:home_lat]
       home_lon =  params[:user][:home_lon]
 
       @user.display_name = params[:user][:display_name]

+      if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
+        @user.pass_crypt = params[:user][:pass_crypt]
+        @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+      end

       @user.description = params[:user][:description]
       @user.description = params[:user][:description]

-      @user.home_lat = home_lat.to_f
-      @user.home_lon = home_lon.to_f
+      @user.home_lat = home_lat
+      @user.home_lon = home_lon

       if @user.save
         flash[:notice] = "User information updated successfully."
       if @user.save
         flash[:notice] = "User information updated successfully."

-        redirect_to :controller => 'user', :action => 'account'
+      else
+        flash.delete(:notice)

       end
     end
   end
       end
     end
   end


@@ -53,12 +62,12 @@ class UserController < ApplicationController
   end
 
   def lost_password
   end
 
   def lost_password

+    @title = 'lost password'

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

-      user = User.find_by_email(params['user']['email'])
+      user = User.find_by_email(params[:user][:email])

       if user
       if user

-        user.token = User.make_token
-        user.save
-        Notifier::deliver_lost_password(user)
+        token = user.tokens.create
+        Notifier::deliver_lost_password(user, token)

         flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       else
         flash[:notice] = "Couldn't find that email address, sorry."
         flash[:notice] = "Sorry you lost it :-( but an email is on its way so you can reset it soon."
       else
         flash[:notice] = "Couldn't find that email address, sorry."


@@ -69,14 +78,17 @@ class UserController < ApplicationController
   end
 
   def reset_password
   end
 
   def reset_password

+    @title = 'reset password'

     if params['token']
     if params['token']

-      user = User.find_by_token(params['token'])
-      if user
-        pass = User.make_token(8)
+      token = UserToken.find_by_token(params[:token])
+      if token
+        pass = OSM::make_token(8)
+        user = token.user

         user.pass_crypt = pass
         user.pass_crypt_confirmation = pass
         user.active = true
         user.pass_crypt = pass
         user.pass_crypt_confirmation = pass
         user.active = true

-        user.save
+        user.save!
+        token.destroy

         Notifier::deliver_reset_password(user, pass)
         flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
       else
         Notifier::deliver_reset_password(user, pass)
         flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
       else


@@ -87,24 +99,25 @@ class UserController < ApplicationController
   end
 
   def new
   end
 
   def new

+    @title = 'create account'

   end
 
   def login
   end
 
   def login

+    @title = 'login'

     if params[:user]
       email = params[:user][:email]
       pass = params[:user][:password]
     if params[:user]
       email = params[:user][:email]
       pass = params[:user][:password]

-      u = User.authenticate(email, pass)
-      if u
-        u.token = User.make_token
-        u.timeout = 1.day.from_now
-        u.save
-        session[:token] = u.token
-        if params[:next_controller] and params[:next_action]
-          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+      user = User.authenticate(:username => email, :password => pass)
+      if user
+        session[:user] = user.id
+        if params[:referer]
+          redirect_to params[:referer]

         else
           redirect_to :controller => 'site', :action => 'index'
         end
         return
         else
           redirect_to :controller => 'site', :action => 'index'
         end
         return

+      elsif User.authenticate(:username => email, :password => pass, :invalid => true)
+        flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."

       else
         flash[:notice] = "Sorry, couldn't log in with those details."
       end
       else
         flash[:notice] = "Sorry, couldn't log in with those details."
       end


@@ -113,50 +126,37 @@ class UserController < ApplicationController
 
   def logout
     if session[:token]
 
   def logout
     if session[:token]

-      u = User.find_by_token(session[:token])
-      if u
-        u.token = User.make_token
-        u.timeout = Time.now
-        u.save
+      token = UserToken.find_by_token(session[:token])
+      if token
+        token.destroy

       end
       end

+      session[:token] = nil

     end
     end

-    session[:token] = nil
-    if params[:next_controller] and params[:next_action]
-      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    session[:user] = nil
+    if params[:referer]
+      redirect_to params[:referer]

     else
       redirect_to :controller => 'site', :action => 'index'
     end
   end
 
   def confirm
     else
       redirect_to :controller => 'site', :action => 'index'
     end
   end
 
   def confirm

-    @user = User.find_by_token(params[:confirm_string])
-    if @user && @user.active == 0
+    token = UserToken.find_by_token(params[:confirm_string])
+    if token and !token.user.active?
+      @user = token.user

       @user.active = true
       @user.active = true

-      @user.save
+      @user.save!
+      token.destroy

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

-
-      #FIXME: login the person magically
-
-      redirect_to :action => 'login'
+      session[:user] = @user.id
+      redirect_to :action => 'account', :display_name => @user.display_name

     else
       flash[:notice] = 'Something went wrong confirming that user.'
     end
   end
 
     else
       flash[:notice] = 'Something went wrong confirming that user.'
     end
   end
 

-  def preferences
-    if request.get?
-      render_text @user.preferences
-    elsif request.post? or request.put?
-      @user.preferences = request.raw_post
-      @user.save!
-      render :nothing => true
-    else
-      render :status => 400, :nothing => true
-    end
-  end
-

   def api_details
   def api_details

-    render :text => @user.to_xml.to_s
+    render :text => @user.to_xml.to_s, :content_type => "text/xml"

   end
 
   def api_gpx_files
   end
 
   def api_gpx_files


@@ -164,15 +164,17 @@ class UserController < ApplicationController
     @user.traces.each do |trace|
       doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
     end
     @user.traces.each do |trace|
       doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
     end

-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"

   end
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])
   end
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])

-  end

 
 

-  def diary
-    @this_user = User.find_by_display_name(params[:display_name])
+    if @this_user
+      @title = @this_user.display_name
+    else
+      render :nothing => true, :status => :not_found
+    end

   end
 
   def make_friend
   end
 
   def make_friend


@@ -191,7 +193,7 @@ class UserController < ApplicationController
       else
         flash[:notice] = "You are already friends with #{name}."  
       end
       else
         flash[:notice] = "You are already friends with #{name}."  
       end

-        redirect_to :controller => 'user', :action => 'view'
+      redirect_to :controller => 'user', :action => 'view'

     end
   end
 
     end
   end