Making amf controller act more like the xml apis

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index df2a799c35c8aa6ccfe4a92e1b1e3f736e3f10b9..825c9263582c8f66076cb891c495ef39610f3e3c 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -16,6 +16,7 @@ class UserController < ApplicationController
     @user.visible = true
     @user.data_public = true
     @user.description = "" if @user.description.nil?
     @user.visible = true
     @user.data_public = true
     @user.description = "" if @user.description.nil?

+    @user.creation_ip = request.remote_ip

 
     if @user.save
       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."
 
     if @user.save
       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."


@@ -76,7 +77,7 @@ class UserController < ApplicationController
   def lost_password
     @title = 'lost password'
     if params[:user] and params[:user][:email]
   def lost_password
     @title = 'lost password'
     if params[:user] and params[:user][:email]

-      user = User.find_by_email(params[:user][:email], :conditions => "visible = 1")
+      user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})

 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create


@@ -116,6 +117,14 @@ class UserController < ApplicationController
   end
 
   def login
   end
 
   def login

+    if session[:user]
+      # The user is logged in already, if the referer param exists, redirect them to that
+      if params[:referer]
+        redirect_to params[:referer]
+      else
+        redirect_to :controller => 'site', :action => 'index'
+      end
+    end

     @title = 'login'
     if params[:user]
       email_or_display_name = params[:user][:email]
     @title = 'login'
     if params[:user]
       email_or_display_name = params[:user][:email]


@@ -216,7 +225,7 @@ class UserController < ApplicationController
   end
 
   def view
   end
 
   def view

-    @this_user = User.find_by_display_name(params[:display_name], :conditions => "visible = 1")
+    @this_user = User.find_by_display_name(params[:display_name], :conditions => {:visible => true})

 
     if @this_user
       @title = @this_user.display_name
 
     if @this_user
       @title = @this_user.display_name


@@ -229,7 +238,7 @@ class UserController < ApplicationController
   def make_friend
     if params[:display_name]     
       name = params[:display_name]
   def make_friend
     if params[:display_name]     
       name = params[:display_name]

-      new_friend = User.find_by_display_name(name, :conditions => "visible = 1")
+      new_friend = User.find_by_display_name(name, :conditions => {:visible => true})

       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id
       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id


@@ -251,7 +260,7 @@ class UserController < ApplicationController
   def remove_friend
     if params[:display_name]     
       name = params[:display_name]
   def remove_friend
     if params[:display_name]     
       name = params[:display_name]

-      friend = User.find_by_display_name(name, :conditions => "visible = 1")
+      friend = User.find_by_display_name(name, :conditions => {:visible => true})

       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = "#{friend.display_name} was removed from your friends."
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = "#{friend.display_name} was removed from your friends."