ways from unwayed segments now automatically fix segment direction

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 5b370334cc0c145f90f3d5c0e57d61c7c2ff963f..80402f6776e7b873901da2583b29e47b990c829c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,15 +2,18 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]
   layout 'site'
 
   before_filter :authorize, :only => [:preferences, :api_details, :api_gpx_files]

-  before_filter :authorize_web, :only => [:edit, :account, :go_public, :view, :diary]
-  before_filter :require_user, :only => [:edit, :set_home, :account, :go_public]
+  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.set_defaults
 
     if @user.save
     @user = User.new(params[:user])
     @user.set_defaults
 
     if @user.save

-      flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)'
+      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)
       redirect_to :action => 'login'
     else
       Notifier::deliver_signup_confirm(@user)
       redirect_to :action => 'login'
     else


@@ -18,18 +21,24 @@ class UserController < ApplicationController
     end
   end
 
     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.home_lat = home_lat.to_f
       @user.home_lon = home_lon.to_f
       if @user.save
       @user.description = params[:user][:description]
       @user.home_lat = home_lat.to_f
       @user.home_lon = home_lon.to_f
       if @user.save

-        flash[:notice] = "User edited OK."
-        redirect_to :controller => 'user', :action => 'account'
+        flash[:notice] = "User information updated successfully."
+      else
+        flash.delete(:notice)

       end
     end
   end
       end
     end
   end


@@ -39,7 +48,7 @@ class UserController < ApplicationController
       @user.home_lat = params[:user][:home_lat].to_f
       @user.home_lon = params[:user][:home_lon].to_f
       if @user.save
       @user.home_lat = params[:user][:home_lat].to_f
       @user.home_lon = params[:user][:home_lon].to_f
       if @user.save

-        flash[:notice] = "User home saved."
+        flash[:notice] = "Home location saved successfully."

         redirect_to :controller => 'user', :action => 'account'
       end
     end
         redirect_to :controller => 'user', :action => 'account'
       end
     end


@@ -48,33 +57,39 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
   def go_public
     @user.data_public = true
     @user.save

-    flash[:notice] = 'All your edits are now public'
-    redirect_to :controller => 'user', :action => 'account'
+    flash[:notice] = 'All your edits are now public.'
+    redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name

   end
 
   def lost_password
   end
 
   def lost_password

-    if params['user']['email']
+    @title = 'lost password'
+    if params[:user] and 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)
       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."
+        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."
       end
       else
         flash[:notice] = "Couldn't find that email address, sorry."
       end

+    else
+      render :action => 'lost_password'

     end
   end
 
   def reset_password
     end
   end
 
   def reset_password

+    @title = 'reset password'

     if params['token']
       user = User.find_by_token(params['token'])
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass
     if params['token']
       user = User.find_by_token(params['token'])
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass

+        user.pass_crypt_confirmation = pass
+        user.active = true

         user.save
         Notifier::deliver_reset_password(user, 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 :-)"
+        flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"

       else
         flash[:notice] = "Didn't find that token, check the URL maybe?"
       end
       else
         flash[:notice] = "Didn't find that token, check the URL maybe?"
       end


@@ -83,9 +98,11 @@ 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]


@@ -95,10 +112,16 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token

-        redirect_to :controller => 'site', :action => 'index'
+        if params[:referer]
+          redirect_to params[:referer]
+        else
+          redirect_to :controller => 'site', :action => 'index'
+        end

         return
         return

+      elsif User.authenticate(email, pass, false)
+        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
       else

-        flash[:notice] = "Couldn't log in with those details"
+        flash[:notice] = "Sorry, couldn't log in with those details."

       end
     end
   end
       end
     end
   end


@@ -113,25 +136,30 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
       end
     end
     session[:token] = nil

-    redirect_to :controller => 'site', :action => 'index'
+    if params[:referer]
+      redirect_to params[:referer]
+    else
+      redirect_to :controller => 'site', :action => 'index'
+    end

   end
 
   def confirm
     @user = User.find_by_token(params[:confirm_string])
     if @user && @user.active == 0
       @user.active = true
   end
 
   def confirm
     @user = User.find_by_token(params[:confirm_string])
     if @user && @user.active == 0
       @user.active = true

+      @user.token = User.make_token
+      @user.timeout = 1.day.from_now

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

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

     else
     else

-      flash[:notice] = 'Something went wrong confirming that user'
+      flash[:notice] = 'Something went wrong confirming that user.'

     end
   end
 
   def preferences
     end
   end
 
   def preferences

+    @title = 'preferences'

     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?
     if request.get?
       render_text @user.preferences
     elsif request.post? or request.put?


@@ -139,12 +167,12 @@ class UserController < ApplicationController
       @user.save!
       render :nothing => true
     else
       @user.save!
       render :nothing => true
     else

-      render :status => 400, :nothing => true
+      render :nothing => true, :status => :method_not_allowed

     end
   end
 
   def api_details
     end
   end
 
   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


@@ -152,17 +180,33 @@ 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])

+    @title = @this_user.display_name

   end
 
   end
 

-  def diary
-    @this_user = User.find_by_display_name(params[:display_name])
+  def make_friend
+
+    if params[:display_name]     
+      name = params[:display_name]
+      friend = Friend.new
+      friend.user_id = @user.id
+      friend.friend_user_id = User.find_by_display_name(name).id 
+      unless @user.is_friends_with?(friend)
+        if friend.save
+          flash[:notice] = "#{name} is now your friend."
+        else
+          friend.add_error("Sorry, failed to add #{name} as a friend.")
+        end
+      else
+        flash[:notice] = "You are already friends with #{name}."  
+      end
+      redirect_to :controller => 'user', :action => 'view'
+    end

   end
 
   end
 

-

 end
 
 end