uptodate with en.yml 15663

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9a1d89da6222213eef1c55108adcdd77b27e4807..fa0adef564aed4c7e236a895111f7f4c6a5234b6 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,35 +1,69 @@
 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, :except => [:api_details, :api_gpx_files]
+  before_filter :set_locale, :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_readable, :except => [:api_details, :api_gpx_files]
+  before_filter :check_database_writable, :only => [:login, :new, :set_home, :account, :go_public, :make_friend, :remove_friend, :upload_image, :delete_image]
+  before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
+
+  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation

 
   def save
 
   def save

-    @user = User.new(params[:user])
-    @user.set_defaults
+    @title = t 'user.new.title'

 
 

-    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)
-      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
+      @user.languages = request.user_preferred_languages
+
+      if @user.save
+        flash[:notice] = t 'user.new.flash create success message'
+        Notifier.deliver_signup_confirm(@user, @user.tokens.create)
+        redirect_to :action => 'login'
+      else
+        render :action => 'new'
+      end

     end
   end
 
     end
   end
 

-  def edit
+  def account
+    @title = t 'user.account.title'
+

     if params[:user] and params[:user][:display_name] and params[:user][:description]
     if params[:user] and params[:user][:display_name] and params[:user][:description]

-      home_lat =  params[:user][:home_lat]
-      home_lon =  params[:user][:home_lon]
+      if params[:user][:email] != @user.email
+        @user.new_email = params[:user][:email]
+      end

 
       @user.display_name = params[:user][:display_name]
 
       @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.languages = params[:user][:languages].split(",")
+      @user.home_lat = params[:user][:home_lat]
+      @user.home_lon = params[:user][:home_lon]
+

       if @user.save
       if @user.save

-        flash[:notice] = "User information updated successfully."
-        redirect_to :controller => 'user', :action => 'account'
+        set_locale
+
+        if params[:user][:email] == @user.new_email
+          flash[:notice] = t 'user.account.flash update success confirm needed'
+          Notifier.deliver_email_confirm(@user, @user.tokens.create)
+        else
+          flash[:notice] = t 'user.account.flash update success'
+        end

       end
     end
   end
       end
     end
   end


@@ -39,7 +73,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] = "Home location saved successfully."
+        flash[:notice] = t 'user.set_home.flash success'

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


@@ -48,115 +82,159 @@ 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.'
+    flash[:notice] = t 'user.go_public.flash success'

     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password
     redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
   end
 
   def lost_password

+    @title = t 'user.lost_password.title'
+

     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], :conditions => {:visible => true})
+

       if user
       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 its way so you can reset it soon."
+        token = user.tokens.create
+        Notifier.deliver_lost_password(user, token)
+        flash[:notice] = t 'user.lost_password.notice email on way'

       else
       else

-        flash[:notice] = "Couldn't find that email address, sorry."
+        flash[:notice] = t 'user.lost_password.notice email cannot find'

       end
       end

-    else
-      render :action => 'lost_password'

     end
   end
 
   def reset_password
     end
   end
 
   def reset_password

+    @title = t 'user.reset_password.title'
+

     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
-        Notifier::deliver_reset_password(user, pass)
-        flash[:notice] = "Your password has been changed and is on its way to your mailbox :-)"
+        user.email_valid = true
+        user.save!
+        token.destroy
+        Notifier.deliver_reset_password(user, pass)
+        flash[:notice] = t 'user.reset_password.flash changed check mail'

       else
       else

-        flash[:notice] = "Didn't find that token, check the URL maybe?"
+        flash[:notice] = t 'user.reset_password.flash token bad'

       end
     end
       end
     end

+

     redirect_to :action => 'login'
   end
 
   def new
     redirect_to :action => 'login'
   end
 
   def new

+    @title = t 'user.new.title'
+
+    # 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 = t 'user.login.title'
+

     if params[:user]
     if params[:user]

-      email = params[:user][:email]
+      email_or_display_name = params[:user][:email]

       pass = params[:user][:password]
       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_or_display_name, :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_or_display_name, :password => pass, :inactive => true)
+        @notice = t 'user.login.account not active'

       else
       else

-        flash[:notice] = "Sorry, couldn't log in with those details."
+        @notice = t 'user.login.auth failure'

       end
     end
   end
 
   def logout
     if session[:token]
       end
     end
   end
 
   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
-      @user.active = true
-      @user.save
-      flash[:notice] = 'Confirmed your account, thanks for signing up!'
-
-      #FIXME: login the person magically
-
-      redirect_to :action => 'login'
-    else
-      flash[:notice] = 'Something went wrong confirming that user.'
+    if params[:confirm_action]
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token and !token.user.active?
+        @user = token.user
+        @user.active = true
+        @user.email_valid = true
+        @user.save!
+        token.destroy
+        flash[:notice] = t 'user.confirm.success'
+        session[:user] = @user.id
+        redirect_to :action => 'account', :display_name => @user.display_name
+      else
+        @notice = t 'user.confirm.failure'
+      end

     end
   end
 
     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
+  def confirm_email
+    if params[:confirm_action]
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token and token.user.new_email?
+        @user = token.user
+        @user.email = @user.new_email
+        @user.new_email = nil
+        @user.active = true
+        @user.email_valid = true
+        @user.save!
+        token.destroy
+        flash[:notice] = t 'user.confirm_email.success'
+        session[:user] = @user.id
+        redirect_to :action => 'account', :display_name => @user.display_name
+      else
+        @notice = t 'user.confirm_email.failure'
+      end

     end
   end
 
     end
   end
 

+  def upload_image
+    @user.image = params[:user][:image]
+    @user.save!
+    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+  end
+
+  def delete_image
+    @user.image = nil
+    @user.save!
+    redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
+  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,36 +242,54 @@ 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
   end
 
   def view

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

 
 

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

   end
 
   def make_friend
   end
 
   def make_friend

-

     if params[:display_name]     
       name = params[:display_name]
     if params[:display_name]     
       name = params[:display_name]

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

       friend = Friend.new
       friend.user_id = @user.id
       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)
+      friend.friend_user_id = new_friend.id
+      unless @user.is_friends_with?(new_friend)

         if friend.save
         if friend.save

-          flash[:notice] = "#{name} is now your friend."
+          flash[:notice] = t 'user.make_friend.success', :name => name
+          Notifier.deliver_friend_notification(friend)

         else
         else

-          friend.add_error("Sorry, failed to add #{name} as a friend.")
+          friend.add_error(t('user.make_friend.failed', :name => name))

         end
       else
         end
       else

-        flash[:notice] = "You are already friends with #{name}."  
+        flash[:notice] = t 'user.make_friend.already_a_friend', :name => name

       end
       end

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

     end
   end
 
     end
   end
 

-end
+  def remove_friend
+    if params[:display_name]     
+      name = params[:display_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] = t 'user.remove_friend.success', :name => friend.display_name
+      else
+        flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
+      end

 
 

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