X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0e66875ace5baf3b86221abd7db86293422c0898..30f740178f9dcae12e577229555471428df77b5e:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index f01157bc0..5eba0e837 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -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.<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
@@ -163,12 +165,12 @@ class UserController < ApplicationController
       @user.save!
       render :nothing => true
     else
-      render :status => 400, :nothing => true
+      render :nothing => true, :status => :method_not_allowed
     end
   end
 
   def api_details
-    render :text => @user.to_xml.to_s
+    render :text => @user.to_xml.to_s, :content_type => "text/xml"
   end
 
   def api_gpx_files
@@ -176,7 +178,7 @@ class UserController < ApplicationController
     @user.traces.each do |trace|
       doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
     end
-    render :text => doc.to_s
+    render :text => doc.to_s, :content_type => "text/xml"
   end
 
   def view
@@ -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]