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]
before_filter :lookup_this_user, :only => [:activate, :deactivate, :hide, :unhide, :delete]
filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
-
+
+ cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+
def save
@title = t 'user.new.title'
if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
render :action => 'new'
else
- #The redirect from the OpenID provider reenters here again
- #and we need to pass the parameters through to the
- #open_id_authentication function a second time
- if params[:open_id_complete]
- openid_verify('', true)
- #We have set the user.openid_url to nil beforehand. If it hasn't
- #been set to a new valid openid_url, it means the openid couldn't be validated
- if @user.nil? or @user.openid_url.nil?
- render :action => 'new'
- return
- end
- 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
- #Set the openid_url to nil as for one it is used
- #to check if the openid could be validated and secondly
- #to not get dupplicate conflicts for an empty openid
- @user.openid_url = nil
-
- if (params[:user][:openid_url].length > 0)
+ #The redirect from the OpenID provider reenters here again
+ #and we need to pass the parameters through to the
+ #open_id_authentication function a second time
+ if params[:open_id_complete]
+ openid_verify('', true)
+ #We have set the user.openid_url to nil beforehand. If it hasn't
+ #been set to a new valid openid_url, it means the openid couldn't be validated
+ if @user.nil? or @user.openid_url.nil?
+ render :action => 'new'
+ return
+ end
+ 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
+ #Set the openid_url to nil as for one it is used
+ #to check if the openid could be validated and secondly
+ #to not get dupplicate conflicts for an empty openid
+ @user.openid_url = nil
+
+if (!params[:user][:openid_url].nil? and params[:user][:openid_url].length > 0)
if @user.pass_crypt.length == 0
#if the password is empty, but we have a openid
#then generate a random passowrd to disable
return
end
end
- if @user.save
- flash[:notice] = t 'user.new.flash create success message'
- Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
- redirect_to :action => 'login'
- else
- render :action => 'new'
- end
+
+ if @user.save
+ flash[:notice] = t 'user.new.flash create success message'
+ Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
+ redirect_to :action => 'login'
+ else
+ render :action => 'new'
+ end
end
end
@title = t 'user.account.title'
@tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
- #The redirect from the OpenID provider reenters here again
+ #The redirect from the OpenID provider reenters here again
#and we need to pass the parameters through to the
#open_id_authentication function
if params[:open_id_complete]
end
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.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
end
- if (params[:user][:openid_url].length == 0)
- #Clearing doesn't need OpenID validation, so we can set it here.
- @user.openid_url = nil
- end
@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.now[:notice] = t 'user.account.flash update success confirm needed'
- Notifier.deliver_email_confirm(@user, @user.tokens.create)
- else
+ if @user.new_email.nil? or @user.new_email.empty?
flash.now[:notice] = t 'user.account.flash update success'
+ else
+ 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
- if (params[:user][:openid_url].length > 0)
+ if (params[:user][:openid_url].length > 0)
begin
@norm_openid_url = OpenIdAuthentication.normalize_identifier(params[:user][:openid_url])
if (@norm_openid_url != @user.openid_url)
end
end
+ 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
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'
+ def open_id_authentication(openid_url)
+ #TODO: only ask for nickname and email, if we don't already have a user for that openID, in which case
+ #email and nickname are already filled out. I don't know how to do that with ruby syntax though, as we
+ #don't want to duplicate the do block
+ #On the other hand it also doesn't matter too much if we ask every time, as the OpenID provider should
+ #remember these results, and shouldn't repromt the user for these data each time.
+ authenticate_with_open_id(openid_url, :return_to => request.protocol + request.host_with_port + '/login?referer=' + params[:referer], :optional => [:nickname, :email]) do |result, identity_url, registration|
+ if result.successful?
+ #We need to use the openid url passed back from the OpenID provider
+ #rather than the one supplied by the user, as these can be different.
+ #e.g. one can simply enter yahoo.com in the login box, i.e. no user specific url
+ #only once it comes back from the OpenID provider do we know the unique address for
+ #the user.
+ user = User.find_by_openid_url(identity_url)
+ if user
+ if user.visible? and user.active?
+ session[:user] = user.id
+ session_expires_after 1.month if session[:remember]
+ else
+ user = nil
+ flash.now[:error] = t 'user.login.account not active'
+ end
+ else
+ #We don't have a user registered to this OpenID. Redirect to the create account page
+ #with username and email filled in if they have been given by the OpenID provider through
+ #the simple registration protocol
+ redirect_to :controller => 'user', :action => 'new', :nickname => registration['nickname'], :email => registration['email'], :openid => identity_url
+ end
+ else if result.missing?
+ #Try and apply some heuristics to make common cases more userfriendly
+ mapped_id = openid_specialcase_mapping(openid_url)
+ if mapped_id
+ open_id_authentication(mapped_id)
+ else
+ flash.now[:error] = t 'user.login.openid missing provider'
+ end
+ else if result.invalid?
+ flash.now[:error] = t 'user.login.openid invalid'
+ else
+ flash.now[:error] = t 'user.login.auth failure'
+ end
+ end
end
end
+
+ user
end
def go_public
if user
token = user.tokens.create
Notifier.deliver_lost_password(user, token)
- flash.now[:notice] = t 'user.lost_password.notice email on way'
+ flash[:notice] = t 'user.lost_password.notice email on way'
+ redirect_to :action => 'login'
else
flash.now[:error] = t 'user.lost_password.notice email cannot find'
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]
- @nickname = params['nickname']
+ @nickname = params['nickname']
@email = params['email']
@openID = params['openid']
end
def login
+ @title = t 'user.login.title'
#The redirect from the OpenID provider reenters here again
#and we need to pass the parameters through to the
# open_id_authentication function
if params[:open_id_complete]
- open_id_authentication('')
- end
-
-
- if params[:user] and session[:user].nil?
-
- if !params[:user][:openid_url].empty?
- open_id_authentication(params[:user][:openid_url])
+ user = open_id_authentication('')
+ elsif params[:user]
+ if !params[:user][:openid_url].nil? and !params[:user][:openid_url].empty?
+ session[:remember] = params[:remember_me]
+ user = open_id_authentication(params[:user][:openid_url])
else
email_or_display_name = params[:user][:email]
pass = params[:user][:password]
- user = User.authenticate(:username => email_or_display_name, :password => pass)
- if user
+
+ if user = User.authenticate(:username => email_or_display_name, :password => pass)
session[:user] = user.id
+ session_expires_after 1.month if params[:remember_me]
elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
flash.now[:error] = t 'user.login.account not active'
else
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]
+
+ if 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.
+ 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
- return
end
-
- @title = t 'user.login.title'
end
- def open_id_authentication(openid_url)
- #TODO: only ask for nickname and email, if we don't already have a user for that openID, in which case
- #email and nickname are already filled out. I don't know how to do that with ruby syntax though, as we
- #don't want to duplicate the do block
- #On the other hand it also doesn't matter too much if we ask every time, as the OpenID provider should
- #remember these results, and shouldn't repromt the user for these data each time.
- authenticate_with_open_id(openid_url, :return_to => request.protocol + request.host_with_port + '/login?referer=' + params[:referer], :optional => [:nickname, :email]) do |result, identity_url, registration|
- if result.successful?
- #We need to use the openid url passed back from the OpenID provider
- #rather than the one supplied by the user, as these can be different.
- #e.g. one can simply enter yahoo.com in the login box, i.e. no user specific url
- #only once it comes back from the OpenID provider do we know the unique address for
- #the user.
- user = User.find_by_openid_url(identity_url)
- if user
- if user.visible? and user.active?
- session[:user] = user.id
- else
- user = nil
- flash.now[:error] = t 'user.login.account not active'
- end
- else
- #We don't have a user registered to this OpenID. Redirect to the create account page
- #with username and email filled in if they have been given by the OpenID provider through
- #the simple registration protocol
- redirect_to :controller => 'user', :action => 'new', :nickname => registration['nickname'], :email => registration['email'], :openid => identity_url
+ 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
- else if result.missing?
- #Try and apply some heuristics to make common cases more userfriendly
- mapped_id = openid_specialcase_mapping(openid_url)
- if mapped_id
- open_id_authentication(mapped_id)
- else
- flash.now[:error] = t 'user.login.openid missing provider'
- end
- else if result.invalid?
- flash.now[:error] = t 'user.login.openid invalid'
- else
- flash.now[:error] = t 'user.login.auth failure'
- end
- end
+ session[:token] = nil
end
- end
- end
-
- def logout
- if session[:token]
- token = UserToken.find_by_token(session[:token])
- if token
- token.destroy
+ session[:user] = nil
+ session_expires_automatically
+ if params[:referer]
+ redirect_to params[:referer]
+ else
+ redirect_to :controller => 'site', :action => 'index'
end
- session[:token] = nil
- end
- session[:user] = nil
- if params[:referer]
- redirect_to params[:referer]
- else
- redirect_to :controller => 'site', :action => 'index'
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
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|
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
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
projects / rails.git / blobdiff