Save the user record after changing it

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9c5ac0d09edf8bf400c196cb14b3ec3d54096082..d7b73c14e6aa0739dbf370b73bba7873f1523317 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,6 +1,7 @@
 class UserController < ApplicationController
   layout :choose_layout
 
 class UserController < ApplicationController
   layout :choose_layout
 

+  skip_before_filter :verify_authenticity_token, :only => [:api_details, :api_gpx_files]

   before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
   before_filter :authorize, :only => [:api_details, :api_gpx_files]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]


@@ -15,8 +16,6 @@ class UserController < ApplicationController
   before_filter :require_administrator, :only => [:set_status, :delete, :list]
   before_filter :lookup_this_user, :only => [:set_status, :delete]
 
   before_filter :require_administrator, :only => [:set_status, :delete, :list]
   before_filter :lookup_this_user, :only => [:set_status, :delete]
 

-  filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
-

   cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
 
   def terms
   cache_sweeper :user_sweeper, :only => [:account, :set_status, :delete]
 
   def terms


@@ -24,9 +23,7 @@ class UserController < ApplicationController
     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?
     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?

-      render :update do |page|
-        page.replace_html "contributorTerms", :partial => "terms"
-      end
+      render :partial => "terms"

     elsif using_open_id?
       # The redirect from the OpenID provider reenters here
       # again and we need to pass the parameters through to
     elsif using_open_id?
       # The redirect from the OpenID provider reenters here
       # again and we need to pass the parameters through to


@@ -41,6 +38,8 @@ class UserController < ApplicationController
       else
         render :action => 'terms'
       end
       else
         render :action => 'terms'
       end

+    elsif params[:user] and Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
+      render :action => 'blocked'

     else
       session[:referer] = params[:referer]
 
     else
       session[:referer] = params[:referer]
 


@@ -50,7 +49,7 @@ class UserController < ApplicationController
       if params[:user] and params[:user][:openid_url] and @user.pass_crypt.empty?
         # We are creating an account with OpenID and no password
         # was specified so create a random one
       if params[:user] and params[:user][:openid_url] and @user.pass_crypt.empty?
         # We are creating an account with OpenID and no password
         # was specified so create a random one

-        @user.pass_crypt = ActiveSupport::SecureRandom.base64(16) 
+        @user.pass_crypt = SecureRandom.base64(16) 

         @user.pass_crypt_confirmation = @user.pass_crypt 
       end
 
         @user.pass_crypt_confirmation = @user.pass_crypt 
       end
 


@@ -74,7 +73,7 @@ class UserController < ApplicationController
         end
       else
         # Not logged in, so redirect to the login page
         end
       else
         # Not logged in, so redirect to the login page

-        redirect_to :action => :login, :referer => request.request_uri
+        redirect_to :action => :login, :referer => request.fullpath

       end
     end
   end
       end
     end
   end


@@ -82,9 +81,7 @@ class UserController < ApplicationController
   def save
     @title = t 'user.new.title'
 
   def save
     @title = t 'user.new.title'
 

-    if Acl.find_by_address(request.remote_ip, :conditions => {:k => "no_account_creation"})
-      render :action => 'new'
-    elsif params[:decline]
+    if params[:decline]

       if @user
         @user.terms_seen = true
 
       if @user
         @user.terms_seen = true
 


@@ -115,6 +112,8 @@ class UserController < ApplicationController
       else
         redirect_to :action => :account, :display_name => @user.display_name
       end
       else
         redirect_to :action => :account, :display_name => @user.display_name
       end

+    elsif Acl.no_account_creation(request.remote_ip, params[:user][:email].split("@").last)
+      render :action => 'blocked'

     else
       @user = User.new(params[:user])
 
     else
       @user = User.new(params[:user])
 


@@ -130,7 +129,7 @@ class UserController < ApplicationController
       if @user.save
         flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
       if @user.save
         flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email

-        Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer)))
+        Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver

         session[:token] = @user.tokens.create.token
         redirect_to :action => 'login', :referer => params[:referer]
       else
         session[:token] = @user.tokens.create.token
         redirect_to :action => 'login', :referer => params[:referer]
       else


@@ -141,7 +140,7 @@ class UserController < ApplicationController
 
   def account
     @title = t 'user.account.title'
 
   def account
     @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'
+    @tokens = @user.oauth_tokens.authorized

 
     if params[:user] and params[:user][:display_name] and params[:user][:description]
       @user.display_name = params[:user][:display_name]
 
     if params[:user] and params[:user][:display_name] and params[:user][:description]
       @user.display_name = params[:user][:display_name]


@@ -169,9 +168,10 @@ class UserController < ApplicationController
         @user.preferred_editor = params[:user][:preferred_editor]
       end
 
         @user.preferred_editor = params[:user][:preferred_editor]
       end
 

-      @user.openid_url = nil if params[:user][:openid_url].empty?
+      @user.openid_url = nil if params[:user][:openid_url].blank?

 
 

-      if params[:user][:openid_url].length > 0 and
+      if params[:user][:openid_url] and
+         params[:user][:openid_url].length > 0 and

          params[:user][:openid_url] != @user.openid_url
         # If the OpenID has changed, we want to check that it is a
         # valid OpenID and one the user has control over before saving
          params[:user][:openid_url] != @user.openid_url
         # If the OpenID has changed, we want to check that it is a
         # valid OpenID and one the user has control over before saving


@@ -189,13 +189,6 @@ class UserController < ApplicationController
       openid_verify(nil, @user) do |user|
         update_user(user)
       end
       openid_verify(nil, @user) do |user|
         update_user(user)
       end

-    else
-      if flash[:errors]
-        flash[:errors].each do |attr,msg|
-          attr = "new_email" if attr == "email" and !@user.new_email.nil?
-          @user.errors.add(attr,msg)
-        end
-      end

     end
   end
 
     end
   end
 


@@ -210,11 +203,19 @@ class UserController < ApplicationController
     @title = t 'user.lost_password.title'
 
     if params[:user] and params[:user][:email]
     @title = t 'user.lost_password.title'
 
     if params[:user] and params[:user][:email]

-      user = User.find_by_email(params[:user][:email], :conditions => {:status => ["pending", "active", "confirmed"]})
+      user = User.visible.find_by_email(params[:user][:email])
+
+      if user.nil?
+        users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
+
+        if users.count == 1
+          user = users.first
+        end
+      end

 
       if user
         token = user.tokens.create
 
       if user
         token = user.tokens.create

-        Notifier.deliver_lost_password(user, token)
+        Notifier.lost_password(user, token).deliver

         flash[:notice] = t 'user.lost_password.notice email on way'
         redirect_to :action => 'login'
       else
         flash[:notice] = t 'user.lost_password.notice email on way'
         redirect_to :action => 'login'
       else


@@ -255,12 +256,23 @@ class UserController < ApplicationController
     @title = t 'user.new.title'
     @referer = params[:referer] || session[:referer]
 
     @title = t 'user.new.title'
     @referer = params[:referer] || session[:referer]
 

-    if session[:user]
+    if @user

       # 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'
-    elsif not params['openid'].nil?
+      if @referer
+        redirect_to @referer
+      else
+        redirect_to :controller => 'site', :action => 'index'
+      end
+    elsif params.key?(:openid)
+      @user = User.new(:email => params[:email],
+                       :email_confirmation => params[:email],
+                       :display_name => params[:nickname],
+                       :openid_url => params[:openid])
+

       flash.now[:notice] = t 'user.new.openid association'
       flash.now[:notice] = t 'user.new.openid association'

+    elsif Acl.no_account_creation(request.remote_ip)
+      render :action => 'blocked'

     end
   end
 
     end
   end
 


@@ -274,6 +286,8 @@ class UserController < ApplicationController
       else
         password_authentication(params[:username], params[:password])
       end
       else
         password_authentication(params[:username], params[:password])
       end

+    elsif params[:notice]
+      flash.now[:notice] = t "user.login.notice_#{params[:notice]}"

     elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end
     elsif flash[:notice].nil?
       flash.now[:notice] =  t 'user.login.notice'
     end


@@ -328,6 +342,7 @@ class UserController < ApplicationController
             token.destroy
 
             session[:user] = user.id
             token.destroy
 
             session[:user] = user.id

+            cookies.permanent["_osm_username"] = user.display_name

 
             if referer.nil?
               flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
 
             if referer.nil?
               flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')


@@ -356,7 +371,7 @@ class UserController < ApplicationController
 
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
 
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])

-      Notifier.deliver_signup_confirm(user, user.tokens.create)
+      Notifier.signup_confirm(user, user.tokens.create).deliver

       flash[:notice] = t 'user.confirm_resend.success', :email => user.email
     else
       flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
       flash[:notice] = t 'user.confirm_resend.success', :email => user.email
     else
       flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]


@@ -380,6 +395,7 @@ class UserController < ApplicationController
         end
         token.destroy
         session[:user] = @user.id
         end
         token.destroy
         session[:user] = @user.id

+        cookies.permanent["_osm_username"] = @user.display_name

         redirect_to :action => 'account', :display_name => @user.display_name
       else
         flash[:error] = t 'user.confirm_email.failure'
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         flash[:error] = t 'user.confirm_email.failure'


@@ -412,14 +428,14 @@ class UserController < ApplicationController
   def make_friend
     if params[:display_name]
       name = params[:display_name]
   def make_friend
     if params[:display_name]
       name = params[:display_name]

-      new_friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
+      new_friend = User.active.where(:display_name => name).first

       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id
       unless @user.is_friends_with?(new_friend)
         if friend.save
           flash[:notice] = t 'user.make_friend.success', :name => name
       friend = Friend.new
       friend.user_id = @user.id
       friend.friend_user_id = new_friend.id
       unless @user.is_friends_with?(new_friend)
         if friend.save
           flash[:notice] = t 'user.make_friend.success', :name => name

-          Notifier.deliver_friend_notification(friend)
+          Notifier.friend_notification(friend).deliver

         else
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
         else
           friend.add_error(t('user.make_friend.failed', :name => name))
         end


@@ -438,7 +454,7 @@ class UserController < ApplicationController
   def remove_friend
     if params[:display_name]
       name = params[:display_name]
   def remove_friend
     if params[:display_name]
       name = params[:display_name]

-      friend = User.find_by_display_name(name, :conditions => {:status => ["active", "confirmed"]})
+      friend = User.active.where(:display_name => name).first

       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       if @user.is_friends_with?(friend)
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name


@@ -457,7 +473,8 @@ class UserController < ApplicationController
   ##
   # sets a user's status
   def set_status
   ##
   # sets a user's status
   def set_status

-    @this_user.update_attributes(:status => params[:status])
+    @this_user.status = params[:status]
+    @this_user.save

     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
   end
 
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
   end
 


@@ -500,8 +517,7 @@ private
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

-      webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
-      failed_login t('user.login.account suspended', :webmaster => webmaster)
+      failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")

     else
       failed_login t('user.login.auth failure')
     end
     else
       failed_login t('user.login.auth failure')
     end


@@ -519,7 +535,7 @@ private
     end
 
     # Start the authentication
     end
 
     # Start the authentication

-    authenticate_with_open_id(openid_expand_url(openid_url), :required => required) do |result, identity_url, sreg, ax|
+    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get, :required => required) do |result, identity_url, sreg, ax|

       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.
       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.


@@ -534,8 +550,7 @@ private
             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then
             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then

-              webmaster = link_to t('user.login.webmaster'), "mailto:webmaster@openstreetmap.org"
-              failed_login t('user.login.account suspended', :webmaster => webmaster)
+              failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")

             else
               failed_login t('user.login.auth failure')
           end
             else
               failed_login t('user.login.auth failure')
           end


@@ -567,7 +582,7 @@ private
   def openid_verify(openid_url, user)
     user.openid_url = openid_url
 
   def openid_verify(openid_url, user)
     user.openid_url = openid_url
 

-    authenticate_with_open_id(openid_expand_url(openid_url)) do |result, identity_url|
+    authenticate_with_open_id(openid_expand_url(openid_url), :method => :get) do |result, identity_url|

       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.
       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.


@@ -607,8 +622,10 @@ private
   ##
   # process a successful login
   def successful_login(user)
   ##
   # process a successful login
   def successful_login(user)

+    cookies.permanent["_osm_username"] = user.display_name
+

     session[:user] = user.id
     session[:user] = user.id

-    session_expires_after 1.month if session[:remember_me]
+    session_expires_after 28.days if session[:remember_me]

 
     target = session[:referer] || url_for(:controller => :site, :action => :index)
 
 
     target = session[:referer] || url_for(:controller => :site, :action => :index)
 


@@ -647,16 +664,27 @@ private
     if user.save
       set_locale
 
     if user.save
       set_locale
 

-      if user.new_email.nil? or user.new_email.empty?
+      cookies.permanent["_osm_username"] = user.display_name
+
+      if user.new_email.blank?

         flash.now[:notice] = t 'user.account.flash update success'
       else
         flash.now[:notice] = t 'user.account.flash update success'
       else

-        flash.now[:notice] = t 'user.account.flash update success confirm needed'
+        user.email = user.new_email

 
 

-        begin
-          Notifier.deliver_email_confirm(user, user.tokens.create)
-        rescue
-          # Ignore errors sending email
+        if user.valid?
+          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+
+          begin
+            Notifier.email_confirm(user, user.tokens.create).deliver
+          rescue
+            # Ignore errors sending email
+          end
+        else
+          @user.errors.set(:new_email, @user.errors.get(:email))
+          @user.errors.set(:email, [])

         end
         end

+
+        user.reset_email!

       end
     end
   end
       end
     end
   end


@@ -671,10 +699,10 @@ private
       if params[:display_name]
         redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
       else
       if params[:display_name]
         redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
       else

-        redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+        redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath

       end
     elsif not @user
       end
     elsif not @user

-      redirect_to :controller => 'user', :action => 'login', :referer => request.request_uri
+      redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath

     end
   end
 
     end
   end