class UserController < ApplicationController
layout 'site'
- before_filter :authorize, :only => :preferences
- before_filter :authorize_web, :only => :rename
+ 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]
-
def save
@user = User.new(params[:user])
@user.set_defaults
render :action => 'new'
end
end
-
- def rename
- new_name = params['display_name']
- if @user
- @user.display_name = new_name
+
+ 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.home_lat = home_lat.to_f
+ @user.home_lon = home_lon.to_f
if @user.save
- flash[:notice] = "User display name updated OK."
- else
- flash[:notice] = "Rename failed: #{ @user.errors.full_messages.join('; ') }."
+ flash[:notice] = "User information updated successfully."
+ redirect_to :controller => 'user', :action => 'account'
end
- else
- flash[:notice] = 'not logged in'
end
- redirect_to :back
+ 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
+ flash[:notice] = "Home location saved successfully."
+ redirect_to :controller => 'user', :action => 'account'
+ end
+ end
+ end
+
+ def go_public
+ @user.data_public = true
+ @user.save
+ flash[:notice] = 'All your edits are now public.'
+ redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
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)
- 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
+ render :action => 'lost_password'
end
end
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)
- 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
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
- flash[:notice] = "Couldn't log in with those details"
+ flash[:notice] = "Sorry, couldn't log in with those details."
end
end
end
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
redirect_to :action => 'login'
else
- flash[:notice] = 'Something went wrong confirming that user'
+ flash[:notice] = 'Something went wrong confirming that user.'
end
end
render :status => 400, :nothing => true
end
end
+
+ def api_details
+ render :text => @user.to_xml.to_s
+ end
+
+ def api_gpx_files
+ doc = OSM::API.new.get_xml_doc
+ @user.traces.each do |trace|
+ doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+ end
+ render :text => doc.to_s
+ 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