Better comments in application controller logic

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 86689644c8032b5139aae2dcfa7b5ed1dabd75c8..73115dc52bd94c1049f75c6a6855367b03414fd2 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -7,8 +7,8 @@ class UserController < ApplicationController
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :set_locale, :except => [:api_details, :api_gpx_files]
   before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]
   before_filter :authorize_web, :except => [:api_details, :api_gpx_files]
   before_filter :set_locale, :except => [:api_details, :api_gpx_files]
   before_filter :require_user, :only => [:account, :go_public, :make_friend, :remove_friend]

-  before_filter :check_database_readable, :except => [:api_details, :api_gpx_files]
-  before_filter :check_database_writable, :only => [:login, :new, :account, :go_public, :make_friend, :remove_friend]
+  before_filter :check_database_readable, :except => [:login, :api_details, :api_gpx_files]
+  before_filter :check_database_writable, :only => [:new, :account, :confirm, :confirm_email, :lost_password, :reset_password, :go_public, :make_friend, :remove_friend]

   before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
   before_filter :require_allow_read_prefs, :only => [:api_details]
   before_filter :require_allow_read_gpx, :only => [:api_gpx_files]
   before_filter :check_api_readable, :only => [:api_details, :api_gpx_files]
   before_filter :require_allow_read_prefs, :only => [:api_details]
   before_filter :require_allow_read_gpx, :only => [:api_gpx_files]


@@ -23,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


@@ -40,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]
 


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

-    if Acl.address(request.remote_ip).where(:k => "no_account_creation").exists?
-      render :action => 'new'
-    elsif params[:decline]
+    if params[:decline]

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


@@ -114,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])
 


@@ -151,7 +151,11 @@ class UserController < ApplicationController
         @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
       end
 
         @user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
       end
 

-      @user.description = params[:user][:description]
+      if params[:user][:description] != @user.description
+        @user.description = params[:user][:description]
+        @user.description_format = "markdown"
+      end
+

       @user.languages = params[:user][:languages].split(",")
 
       case params[:image_action]
       @user.languages = params[:user][:languages].split(",")
 
       case params[:image_action]


@@ -168,9 +172,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


@@ -188,13 +193,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
 


@@ -209,7 +207,15 @@ 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.visible.where(:email => params[:user][:email]).first
+      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


@@ -253,17 +259,24 @@ class UserController < ApplicationController
   def new
     @title = t 'user.new.title'
     @referer = params[:referer] || session[:referer]
   def new
     @title = t 'user.new.title'
     @referer = params[:referer] || session[:referer]

-    @user = User.new(:email => params[:email],
-                     :email_confirmation => params[:email],
-                     :display_name => params[:nickname],
-                     :openid_url => params[:openid])

 
 

-    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
 


@@ -277,6 +290,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


@@ -331,6 +346,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')


@@ -383,6 +399,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'


@@ -406,9 +423,7 @@ class UserController < ApplicationController
        (@this_user.visible? or (@user and @user.administrator?))
       @title = @this_user.display_name
     else
        (@this_user.visible? or (@user and @user.administrator?))
       @title = @this_user.display_name
     else

-      @title = t 'user.no_such_user.title'
-      @not_found_user = params[:display_name]
-      render :action => 'no_such_user', :status => :not_found
+      render_unknown_user params[:display_name]

     end
   end
 
     end
   end
 


@@ -460,7 +475,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
 


@@ -503,8 +519,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


@@ -522,7 +537,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.


@@ -537,8 +552,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


@@ -570,7 +584,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.


@@ -610,8 +624,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)
 


@@ -650,16 +666,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
+
+        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
+          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


@@ -693,7 +720,7 @@ private
   # Choose the layout to use. See
   # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
   def choose_layout
   # Choose the layout to use. See
   # https://rails.lighthouseapp.com/projects/8994/tickets/5371-layout-with-onlyexcept-options-makes-other-actions-render-without-layouts
   def choose_layout

-    oauth_url = url_for(:controller => :oauth, :action => :oauthorize, :only_path => true)
+    oauth_url = url_for(:controller => :oauth, :action => :authorize, :only_path => true)

 
     if [ 'api_details' ].include? action_name
       nil
 
     if [ 'api_details' ].include? action_name
       nil