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 :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
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_database_writable, :only => [:login, :new, :account, :go_public, :make_friend, :remove_friend]
before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
before_filter :require_allow_read_prefs, :only => [:api_details]
before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
+ cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+
+ def terms
+ @title = t 'user.new.title'
+ @user = User.new(params[:user])
+
+ country_code = params[:legale] || OSM.IPToCountry(request.remote_ip)
+ @text = OSM.legal_text_for_country(country_code)
+
+ if @user.invalid?
+ render :action => 'new'
+ end
+ end
+
def save
@title = t 'user.new.title'
@user.description = "" if @user.description.nil?
@user.creation_ip = request.remote_ip
@user.languages = request.user_preferred_languages
+ @user.terms_agreed = Time.now.getutc
if @user.save
flash[:notice] = t 'user.new.flash create success message'
@tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
if params[:user] and params[:user][:display_name] and params[:user][:description]
- if params[:user][:email] != @user.email
- @user.new_email = params[:user][:email]
- end
-
@user.display_name = params[:user][:display_name]
+ @user.new_email = params[:user][:new_email]
if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
@user.pass_crypt = params[:user][:pass_crypt]
@user.description = params[:user][:description]
@user.languages = params[:user][:languages].split(",")
+
+ case params[:image_action]
+ when "new" then @user.image = params[:user][:image]
+ when "delete" then @user.image = nil
+ end
+
@user.home_lat = params[:user][:home_lat]
@user.home_lon = params[:user][:home_lon]
if @user.save
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)
+ if @user.new_email.nil? or @user.new_email.empty?
+ flash.now[:notice] = t 'user.account.flash update success'
else
- flash[:notice] = t 'user.account.flash update success'
+ flash.now[:notice] = t 'user.account.flash update success confirm needed'
+
+ begin
+ Notifier.deliver_email_confirm(@user, @user.tokens.create)
+ rescue
+ # Ignore errors sending email
+ end
end
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
- flash[:notice] = t 'user.set_home.flash success'
- redirect_to :controller => 'user', :action => 'account'
+ else
+ if flash[:errors]
+ flash[:errors].each do |attr,msg|
+ attr = "new_email" if attr == "email"
+ @user.errors.add(attr,msg)
+ end
end
end
end
if user
token = user.tokens.create
Notifier.deliver_lost_password(user, token)
- @notice = t 'user.lost_password.notice email on way'
+ flash[:notice] = t 'user.lost_password.notice email on way'
+ redirect_to :action => 'login'
else
- @notice = t 'user.lost_password.notice email cannot find'
+ flash.now[:error] = t 'user.lost_password.notice email cannot find'
end
end
end
end
end
else
- flash[:notice] = t 'user.reset_password.flash token bad'
+ flash[:error] = t 'user.reset_password.flash token bad'
redirect_to :action => 'lost_password'
end
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
+ # 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
- if params[:user] and session[:user].nil?
+ @title = t 'user.login.title'
+
+ if params[:user]
email_or_display_name = params[:user][:email]
pass = params[:user][:password]
user = User.authenticate(:username => email_or_display_name, :password => pass)
+
if user
session[:user] = user.id
- elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
- @notice = t 'user.login.account not active'
+ session_expires_after 1.month if params[:remember_me]
+
+ # The user is logged in, if the referer param exists, redirect
+ # them to that unless they've also got a block on them, in
+ # which case redirect them to the block so they can clear it.
+ if user.blocked_on_view
+ redirect_to user.blocked_on_view, :referrer => params[:referrer]
+ elsif params[:referer]
+ redirect_to params[:referer]
+ else
+ redirect_to :controller => 'site', :action => 'index'
+ end
+ elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
+ flash.now[:error] = t 'user.login.account not active'
else
- @notice = t 'user.login.auth failure'
+ flash.now[:error] = t 'user.login.auth failure'
end
end
+ end
- if session[:user]
- # The user is logged in, if the referer param exists, redirect them to that
- # unless they've also got a block on them, in which case redirect them to
- # the block so they can clear it.
- user = User.find(session[:user])
- block = user.blocked_on_view
- if block
- redirect_to block, :referrer => params[:referrer]
- elsif params[:referer]
+ def logout
+ @title = t 'user.logout.title'
+
+ if params[:session] == request.session_options[:id]
+ if session[:token]
+ token = UserToken.find_by_token(session[:token])
+ if token
+ token.destroy
+ end
+ session[:token] = nil
+ end
+ session[:user] = nil
+ session_expires_automatically
+ if params[:referer]
redirect_to params[:referer]
else
redirect_to :controller => 'site', :action => 'index'
end
- return
- end
-
- @title = t 'user.login.title'
- end
-
- def logout
- if session[:token]
- token = UserToken.find_by_token(session[:token])
- if token
- token.destroy
- end
- session[:token] = nil
- end
- session[:user] = nil
- if params[:referer]
- redirect_to params[:referer]
- else
- redirect_to :controller => 'site', :action => 'index'
end
end
redirect_to :action => 'account', :display_name => @user.display_name
end
else
- @notice = t 'user.confirm.failure'
+ flash.now[:error] = t 'user.confirm.failure'
end
end
end
@user.new_email = nil
@user.active = true
@user.email_valid = true
- @user.save!
+ if @user.save
+ flash[:notice] = t 'user.confirm_email.success'
+ else
+ flash[:errors] = @user.errors
+ end
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'
+ flash.now[:error] = t 'user.confirm_email.failure'
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_gpx_files
doc = OSM::API.new.get_xml_doc
@user.traces.each do |trace|
friend.add_error(t('user.make_friend.failed', :name => name))
end
else
- flash[:notice] = t 'user.make_friend.already_a_friend', :name => name
+ flash[:warning] = t 'user.make_friend.already_a_friend', :name => name
end
- redirect_to :controller => 'user', :action => 'view'
+ if params[:referer]
+ redirect_to params[:referer]
+ else
+ redirect_to :controller => 'user', :action => 'view'
+ end
end
end
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
+ flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
end
- redirect_to :controller => 'user', :action => 'view'
+ if params[:referer]
+ redirect_to params[:referer]
+ else
+ redirect_to :controller => 'user', :action => 'view'
+ end
end
end
# and return them to the user page.
def require_administrator
unless @user.administrator?
- flash[:notice] = t('user.filter.not_an_administrator')
+ flash[:error] = t('user.filter.not_an_administrator')
redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
end
end
projects / rails.git / blobdiff