Fix statistics script to work with 0.6 database schema.

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 2bb4eb5772ff329d047ead6a0005a9730a4a625c..553e841aa3658af2a3342a09a94be7391097bc44 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -2,7 +2,7 @@ class UserController < ApplicationController
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   layout 'site'
 
   before_filter :authorize, :only => [:api_details, :api_gpx_files]

-  before_filter :authorize_web, :only => [:account, :go_public, :view, :diary, :make_friend, :remove_friend, :upload_image, :delete_image]
+  before_filter :authorize_web, :except => [:api_details, :api_gpx_files]

   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_availability, :except => [:api_details, :api_gpx_files]
   before_filter :check_read_availability, :only => [:api_details, :api_gpx_files]
   before_filter :require_user, :only => [:set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
   before_filter :check_database_availability, :except => [:api_details, :api_gpx_files]
   before_filter :check_read_availability, :only => [:api_details, :api_gpx_files]


@@ -11,17 +11,24 @@ class UserController < ApplicationController
 
   def save
     @title = 'create account'
 
   def save
     @title = 'create account'

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

 
 

-    @user.data_public = true
-    @user.description = "" if @user.description.nil?
-
-    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."
-      Notifier.deliver_signup_confirm(@user, @user.tokens.create)
-      redirect_to :action => 'login'
-    else
+    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})

       render :action => 'new'
       render :action => 'new'

+    else
+      @user = User.new(params[:user])
+
+      @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."
+        Notifier.deliver_signup_confirm(@user, @user.tokens.create)
+        redirect_to :action => 'login'
+      else
+        render :action => 'new'
+      end

     end
   end
 
     end
   end
 


@@ -75,7 +82,8 @@ 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])
+      user = User.find_by_email(params[:user][:email], :conditions => {:visible => true})
+

       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)


@@ -111,9 +119,21 @@ class UserController < ApplicationController
 
   def new
     @title = 'create account'
 
   def new
     @title = 'create account'

+    # The user is logged in already, so don't show them the signup page, instead
+    # send them to the home page
+    redirect_to :controller => 'site', :action => 'index' if session[:user]

   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
+      return
+    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]


@@ -214,7 +234,7 @@ class UserController < ApplicationController
   end
 
   def view
   end
 
   def view

-    @this_user = User.find_by_display_name(params[:display_name])
+    @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


@@ -227,7 +247,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)
+      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


@@ -249,12 +269,12 @@ 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)
+      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."
       else
       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."
       else

-        flash[:notice] = "#{friend.display_name} was not already one of your friends."
+        flash[:notice] = "#{friend.display_name} is not one of your friends."

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