X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/072b0717e4d7fd69e1d28c5c4c3805c7fb4f563e..97d5d1d3850e63fadd9664b9982428f058625c5b:/app/controllers/user_controller.rb
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 459058ee5..9972ca3ee 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -11,7 +11,7 @@ class UserController < ApplicationController
@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 :-)
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
@@ -116,6 +116,8 @@ class UserController < ApplicationController
redirect_to :controller => 'site', :action => 'index'
end
return
+ elsif User.authenticate(email, pass, false)
+ flash[:notice] = "Sorry, your account is not active yet.
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
@@ -163,7 +165,7 @@ class UserController < ApplicationController
@user.save!
render :nothing => true
else
- render :status => 400, :nothing => true
+ render :nothing => true, :status => :method_not_allowed
end
end
@@ -184,11 +186,6 @@ class UserController < ApplicationController
@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]