Change server_settings to smtp_settings to avoid deprecation warning.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9fd20f2ff669a6dece17d773b3943cb54aa2e820..9a1d89da6222213eef1c55108adcdd77b27e4807 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,9 +2,9 @@ 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]
-  before_filter :require_user, :only => [:edit, :account, :go_public]
- 
+  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]
+

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


@@ -20,10 +20,26 @@ class UserController < ApplicationController
 
   def edit
     if params[:user] and params[:user][:display_name] and params[:user][:description]
 
   def edit
     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]
       @user.description = params[:user][:description]
       @user.display_name = params[:user][:display_name]
       @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 information updated successfully."
+        redirect_to :controller => 'user', :action => 'account'
+      end
+    end
+  end
+
+  def set_home
+    if params[:user][:home_lat] and params[:user][:home_lon]
+      @user.home_lat = params[:user][:home_lat].to_f
+      @user.home_lon = params[:user][:home_lon].to_f

       if @user.save
       if @user.save

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

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


@@ -32,21 +48,23 @@ 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']
+    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
 
     end
   end
 


@@ -56,9 +74,11 @@ class UserController < ApplicationController
       if user
         pass = User.make_token(8)
         user.pass_crypt = pass
       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


@@ -79,10 +99,14 @@ 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[:next_controller] and params[:next_action]
+          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        else
+          redirect_to :controller => 'site', :action => 'index'
+        end

         return
       else
         return
       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


@@ -97,7 +121,11 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
       end
     end
     session[:token] = nil

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

   end
 
   def confirm
   end
 
   def confirm


@@ -111,7 +139,7 @@ class UserController < ApplicationController
 
       redirect_to :action => 'login'
     else
 
       redirect_to :action => 'login'
     else

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

     end
   end
 
     end
   end
 


@@ -139,11 +167,33 @@ class UserController < ApplicationController
     render :text => doc.to_s
   end
 
     render :text => doc.to_s
   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])
+  end
+
+  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