Fix rubocop style issues

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a7bf53824821a4559672b9d1446eccb7dc74bee3..70fa4f7fca6e02f4341cb4a31f39a10d946ad88e 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -20,7 +20,7 @@ class UserController < ApplicationController
   before_filter :lookup_user_by_name, :only => [:set_status, :delete]
 
   def terms
   before_filter :lookup_user_by_name, :only => [:set_status, :delete]
 
   def terms

-    @legale = params[:legale] || OSM.IPToCountry(request.remote_ip) || DEFAULT_LEGALE
+    @legale = params[:legale] || OSM.ip_to_country(request.remote_ip) || DEFAULT_LEGALE

     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?
     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?


@@ -28,10 +28,10 @@ class UserController < ApplicationController
     else
       @title = t 'user.terms.title'
 
     else
       @title = t 'user.terms.title'
 

-      if @user and @user.terms_agreed?
+      if @user && @user.terms_agreed?

         # Already agreed to terms, so just show settings
         redirect_to :action => :account, :display_name => @user.display_name
         # Already agreed to terms, so just show settings
         redirect_to :action => :account, :display_name => @user.display_name

-      elsif @user.nil? and session[:new_user].nil?
+      elsif @user.nil? && session[:new_user].nil?

         redirect_to :action => :login, :referer => request.fullpath
       end
     end
         redirect_to :action => :login, :referer => request.fullpath
       end
     end


@@ -57,13 +57,12 @@ class UserController < ApplicationController
         redirect_to t('user.terms.declined')
       end
     elsif @user
         redirect_to t('user.terms.declined')
       end
     elsif @user

-      if !@user.terms_agreed?
+      unless @user.terms_agreed?

         @user.consider_pd = params[:user][:consider_pd]
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true
         @user.consider_pd = params[:user][:consider_pd]
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true

-        if @user.save
-          flash[:notice] = t 'user.new.terms accepted'
-        end
+
+        flash[:notice] = t 'user.new.terms accepted' if @user.save

       end
 
       if params[:referer]
       end
 
       if params[:referer]


@@ -81,7 +80,7 @@ class UserController < ApplicationController
         @user.languages = http_accept_language.user_preferred_languages
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true
         @user.languages = http_accept_language.user_preferred_languages
         @user.terms_agreed = Time.now.getutc
         @user.terms_seen = true

-        @user.openid_url = nil if @user.openid_url and @user.openid_url.empty?
+        @user.openid_url = nil if @user.openid_url && @user.openid_url.empty?

 
         if @user.save
           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)
 
         if @user.save
           flash[:piwik_goal] = PIWIK["goals"]["signup"] if defined?(PIWIK)


@@ -92,9 +91,9 @@ class UserController < ApplicationController
             uri = URI(session[:referer])
             /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m|
               editor = Rack::Utils.parse_query(uri.query).slice('editor')
             uri = URI(session[:referer])
             /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m|
               editor = Rack::Utils.parse_query(uri.query).slice('editor')

-              referer = welcome_path({'zoom' => m[1],
-                                      'lat' => m[2],
-                                      'lon' => m[3]}.merge(editor))
+              referer = welcome_path({ 'zoom' => m[1],
+                                       'lat' => m[2],
+                                       'lon' => m[3] }.merge(editor))

             end
           rescue
             # Use default
             end
           rescue
             # Use default


@@ -119,9 +118,9 @@ class UserController < ApplicationController
     @title = t 'user.account.title'
     @tokens = @user.oauth_tokens.authorized
 
     @title = t 'user.account.title'
     @tokens = @user.oauth_tokens.authorized
 

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

          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


@@ -152,15 +151,13 @@ class UserController < ApplicationController
   def lost_password
     @title = t 'user.lost_password.title'
 
   def lost_password
     @title = t 'user.lost_password.title'
 

-    if params[:user] and params[:user][:email]
+    if params[:user] && params[:user][:email]

       user = User.visible.find_by_email(params[:user][:email])
 
       if user.nil?
         users = User.visible.where("LOWER(email) = LOWER(?)", params[:user][:email])
 
       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
+        user = users.first if users.count == 1

       end
 
       if user
       end
 
       if user


@@ -218,7 +215,7 @@ class UserController < ApplicationController
         user.status = "active" if user.email == verified_email
       end
 
         user.status = "active" if user.email == verified_email
       end
 

-      if @user.openid_url.nil? or @user.invalid?
+      if @user.openid_url.nil? || @user.invalid?

         render :action => 'new'
       else
         session[:new_user] = @user
         render :action => 'new'
       else
         session[:new_user] = @user


@@ -275,13 +272,14 @@ class UserController < ApplicationController
   end
 
   def login
   end
 
   def login

-    if params[:username] or using_open_id?
-      session[:remember_me] ||= params[:remember_me]
+    if params[:username] || using_open_id?

       session[:referer] ||= params[:referer]
 
       if using_open_id?
       session[:referer] ||= params[:referer]
 
       if using_open_id?

+        session[:remember_me] ||= params[:remember_me_openid]

         openid_authentication(params[:openid_url])
       else
         openid_authentication(params[:openid_url])
       else

+        session[:remember_me] ||= params[:remember_me]

         password_authentication(params[:username], params[:password])
       end
     end
         password_authentication(params[:username], params[:password])
       end
     end


@@ -293,9 +291,7 @@ class UserController < ApplicationController
     if params[:session] == request.session_options[:id]
       if session[:token]
         token = UserToken.find_by_token(session[:token])
     if params[:session] == request.session_options[:id]
       if session[:token]
         token = UserToken.find_by_token(session[:token])

-        if token
-          token.destroy
-        end
+        token.destroy if token

         session.delete(:token)
       end
       session.delete(:user)
         session.delete(:token)
       end
       session.delete(:user)


@@ -332,7 +328,7 @@ class UserController < ApplicationController
           token = nil
         end
 
           token = nil
         end
 

-        if token.nil? or token.user != user
+        if token.nil? || token.user != user

           flash[:notice] = t('user.confirm.success')
           redirect_to :action => :login, :referer => referer
         else
           flash[:notice] = t('user.confirm.success')
           redirect_to :action => :login, :referer => referer
         else


@@ -345,9 +341,8 @@ class UserController < ApplicationController
       end
     else
       user = User.find_by_display_name(params[:display_name])
       end
     else
       user = User.find_by_display_name(params[:display_name])

-      if !user || user.active?
-        redirect_to root_path
-      end
+
+      redirect_to root_path if !user || user.active?

     end
   end
 
     end
   end
 


@@ -365,7 +360,7 @@ class UserController < ApplicationController
   def confirm_email
     if request.post?
       token = UserToken.find_by_token(params[:confirm_string])
   def confirm_email
     if request.post?
       token = UserToken.find_by_token(params[:confirm_string])

-      if token and token.user.new_email?
+      if token && token.user.new_email?

         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil


@@ -397,7 +392,7 @@ class UserController < ApplicationController
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     @user.traces.each do |trace|
   def api_gpx_files
     doc = OSM::API.new.get_xml_doc
     @user.traces.each do |trace|

-      doc.root << trace.to_xml_node() if trace.public? or trace.user == @user
+      doc.root << trace.to_xml_node if trace.public? || trace.user == @user

     end
     render :text => doc.to_s, :content_type => "text/xml"
   end
     end
     render :text => doc.to_s, :content_type => "text/xml"
   end


@@ -405,8 +400,8 @@ class UserController < ApplicationController
   def view
     @this_user = User.find_by_display_name(params[:display_name])
 
   def view
     @this_user = User.find_by_display_name(params[:display_name])
 

-    if @this_user and
-       (@this_user.visible? or (@user and @user.administrator?))
+    if @this_user &&
+       (@this_user.visible? || (@user && @user.administrator?))

       @title = @this_user.display_name
     else
       render_unknown_user params[:display_name]
       @title = @this_user.display_name
     else
       render_unknown_user params[:display_name]


@@ -421,15 +416,15 @@ class UserController < ApplicationController
         friend = Friend.new
         friend.user_id = @user.id
         friend.friend_user_id = @new_friend.id
         friend = Friend.new
         friend.user_id = @user.id
         friend.friend_user_id = @new_friend.id

-        unless @user.is_friends_with?(@new_friend)
+        if @user.is_friends_with?(@new_friend)
+          flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name
+        else

           if friend.save
             flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
             Notifier.friend_notification(friend).deliver_now
           else
             friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
           end
           if friend.save
             flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
             Notifier.friend_notification(friend).deliver_now
           else
             friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
           end

-        else
-          flash[:warning] = t 'user.make_friend.already_a_friend', :name => @new_friend.display_name

         end
 
         if params[:referer]
         end
 
         if params[:referer]


@@ -485,14 +480,14 @@ class UserController < ApplicationController
   # display a list of users matching specified criteria
   def list
     if request.post?
   # display a list of users matching specified criteria
   def list
     if request.post?

-      ids = params[:user].keys.collect { |id| id.to_i }
+      ids = params[:user].keys.collect(&:to_i)

 
       User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
       User.update_all("status = 'deleted'", :id => ids) if params[:hide]
 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else
 
       User.update_all("status = 'confirmed'", :id => ids) if params[:confirm]
       User.update_all("status = 'deleted'", :id => ids) if params[:hide]
 
       redirect_to url_for(:status => params[:status], :ip => params[:ip], :page => params[:page])
     else

-      conditions = Hash.new
+      conditions = {}

       conditions[:status] = params[:status] if params[:status]
       conditions[:creation_ip] = params[:ip] if params[:ip]
 
       conditions[:status] = params[:status] if params[:status]
       conditions[:creation_ip] = params[:ip] if params[:ip]
 


@@ -503,7 +498,7 @@ class UserController < ApplicationController
     end
   end
 
     end
   end
 

-private
+  private

 
   ##
   # handle password authentication
 
   ##
   # handle password authentication


@@ -524,7 +519,7 @@ private
   def openid_authentication(openid_url)
     # If we don't appear to have a user for this URL then ask the
     # provider for some extra information to help with signup
   def openid_authentication(openid_url)
     # If we don't appear to have a user for this URL then ask the
     # provider for some extra information to help with signup

-    if openid_url and User.find_by_openid_url(openid_url)
+    if openid_url && User.find_by_openid_url(openid_url)

       required = nil
     else
       required = [:nickname, :email, "http://axschema.org/namePerson/friendly", "http://axschema.org/contact/email"]
       required = nil
     else
       required = [:nickname, :email, "http://axschema.org/namePerson/friendly", "http://axschema.org/contact/email"]


@@ -541,19 +536,19 @@ private
         # provider do we know the unique address for the user.
         if user = User.find_by_openid_url(identity_url)
           case user.status
         # provider do we know the unique address for the user.
         if user = User.find_by_openid_url(identity_url)
           case user.status

-            when "pending" then
-              unconfirmed_login(user)
-            when "active", "confirmed" then
-              successful_login(user)
-            when "suspended" then
-              failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
-            else
-              failed_login t('user.login.auth failure')
+          when "pending" then
+            unconfirmed_login(user)
+          when "active", "confirmed" then
+            successful_login(user)
+          when "suspended" then
+            failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
+          else
+            failed_login t('user.login.auth failure')

           end
         else
           # Guard against not getting any extension data
           end
         else
           # Guard against not getting any extension data

-          sreg = Hash.new if sreg.nil?
-          ax = Hash.new if ax.nil?
+          sreg = {} if sreg.nil?
+          ax = {} if ax.nil?

 
           # We don't have a user registered to this OpenID, so redirect
           # to the create account page with username and email filled
 
           # We don't have a user registered to this OpenID, so redirect
           # to the create account page with username and email filled


@@ -584,8 +579,8 @@ private
         # Do we trust the emails this provider returns?
         if openid_email_verified(identity_url)
           # Guard against not getting any extension data
         # Do we trust the emails this provider returns?
         if openid_email_verified(identity_url)
           # Guard against not getting any extension data

-          sreg = Hash.new if sreg.nil?
-          ax = Hash.new if ax.nil?
+          sreg = {} if sreg.nil?
+          ax = {} if ax.nil?

 
           # Get the verified email
           verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first
 
           # Get the verified email
           verified_email = sreg["email"] || ax["http://axschema.org/contact/email"].first


@@ -615,7 +610,7 @@ private
   def openid_expand_url(openid_url)
     if openid_url.nil?
       return nil
   def openid_expand_url(openid_url)
     if openid_url.nil?
       return nil

-    elsif openid_url.match(/(.*)gmail.com(\/?)$/) or openid_url.match(/(.*)googlemail.com(\/?)$/)
+    elsif openid_url.match(/(.*)gmail.com(\/?)$/) || openid_url.match(/(.*)googlemail.com(\/?)$/)

       # Special case gmail.com as it is potentially a popular OpenID
       # provider and, unlike yahoo.com, where it works automatically, Google
       # have hidden their OpenID endpoint somewhere obscure this making it
       # Special case gmail.com as it is potentially a popular OpenID
       # provider and, unlike yahoo.com, where it works automatically, Google
       # have hidden their OpenID endpoint somewhere obscure this making it


@@ -630,8 +625,8 @@ private
   # check if we trust an OpenID provider to return a verified
   # email, so that we can skpi verifying it ourselves
   def openid_email_verified(openid_url)
   # check if we trust an OpenID provider to return a verified
   # email, so that we can skpi verifying it ourselves
   def openid_email_verified(openid_url)

-    openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) or
-    openid_url.match(/https:\/\/me.yahoo.com\/(.*)/)
+    openid_url.match(/https:\/\/www.google.com\/accounts\/o8\/id?(.*)/) ||
+      openid_url.match(/https:\/\/me.yahoo.com\/(.*)/)

   end
 
   ##
   end
 
   ##


@@ -648,7 +643,7 @@ private
     # - If they have a block on them, show them that.
     # - If they were referred to the login, send them back there.
     # - Otherwise, send them to the home page.
     # - If they have a block on them, show them that.
     # - If they were referred to the login, send them back there.
     # - Otherwise, send them to the home page.

-    if REQUIRE_TERMS_SEEN and not user.terms_seen
+    if REQUIRE_TERMS_SEEN && !user.terms_seen

       redirect_to :controller => :user, :action => :terms, :referer => target
     elsif user.blocked_on_view
       redirect_to user.blocked_on_view, :referer => target
       redirect_to :controller => :user, :action => :terms, :referer => target
     elsif user.blocked_on_view
       redirect_to user.blocked_on_view, :referer => target


@@ -686,7 +681,7 @@ private
     user.display_name = params[:user][:display_name]
     user.new_email = params[:user][:new_email]
 
     user.display_name = params[:user][:display_name]
     user.new_email = params[:user][:new_email]
 

-    if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
+    if params[:user][:pass_crypt].length > 0 || params[:user][:pass_crypt_confirmation].length > 0

       user.pass_crypt = params[:user][:pass_crypt]
       user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
     end
       user.pass_crypt = params[:user][:pass_crypt]
       user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
     end


@@ -724,7 +719,7 @@ private
     if user.save
       set_locale
 
     if user.save
       set_locale
 

-      if user.new_email.blank? or user.new_email == user.email
+      if user.new_email.blank? || user.new_email == user.email

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


@@ -751,7 +746,7 @@ private
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator
   # require that the user is a administrator, or fill out a helpful error message
   # and return them to the user page.
   def require_administrator

-    if @user and not @user.administrator?
+    if @user && !@user.administrator?

       flash[:error] = t('user.filter.not_an_administrator')
 
       if params[:display_name]
       flash[:error] = t('user.filter.not_an_administrator')
 
       if params[:display_name]


@@ -759,7 +754,7 @@ private
       else
         redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
       end
       else
         redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
       end

-    elsif not @user
+    elsif !@user

       redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
     end
   end
       redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
     end
   end


@@ -816,6 +811,6 @@ private
       render :action => 'blocked'
     end
 
       render :action => 'blocked'
     end
 

-    not blocked
+    !blocked

   end
 end
   end
 end