@user.set_defaults
if @user.save
- flash[:notice] = 'User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)'
+ flash[:notice] = "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br>Please note that you won't be able to login until you've received and confirmed your email address."
Notifier::deliver_signup_confirm(@user)
redirect_to :action => 'login'
else
redirect_to :controller => 'site', :action => 'index'
end
return
+ elsif User.authenticate(email, pass, false)
+ flash[:notice] = "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
else
flash[:notice] = "Sorry, couldn't log in with those details."
end
@user.save!
render :nothing => true
else
- render :status => 400, :nothing => true
+ render :nothing => true, :status => :method_not_allowed
end
end
@title = @this_user.display_name
end
- def diary
- @this_user = User.find_by_display_name(params[:display_name])
- @title = @this_user.display_name + "'s diary"
- end
-
def make_friend
if params[:display_name]