@user.terms_agreed = Time.now.getutc
if @user.save
- flash[:notice] = t 'user.new.flash create success message'
+ flash[:notice] = t 'user.new.flash create success message', :email => @user.email
Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
redirect_to :action => 'login'
else
end
def confirm
- if params[:confirm_action]
+ if request.post?
token = UserToken.find_by_token(params[:confirm_string])
if token and !token.user.active?
@user = token.user
redirect_to :action => 'account', :display_name => @user.display_name
end
else
- flash.now[:error] = t 'user.confirm.failure'
+ flash[:error] = t 'user.confirm.failure'
+ redirect_to :action => 'login', :display_name => @user.display_name
end
end
end
def confirm_email
- if params[:confirm_action]
+ if request.post?
token = UserToken.find_by_token(params[:confirm_string])
if token and token.user.new_email?
@user = token.user
session[:user] = @user.id
redirect_to :action => 'account', :display_name => @user.display_name
else
- flash.now[:error] = t 'user.confirm_email.failure'
+ flash[:error] = t 'user.confirm_email.failure'
+ redirect_to :action => 'account', :display_name => @user.display_name
end
end
end