Add JSHint to travis configuration

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

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index ea50113e5d2478a2652f35a1517541cba5947c20..6cb0b60dba9f64c8f0d86cefcc61798b69c39330 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,5 +1,5 @@
 class UserController < ApplicationController
 class UserController < ApplicationController

-  layout 'site', :except => [:api_details]
+  layout "site", :except => [:api_details]

 
   skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files]
   before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]
 
   skip_before_filter :verify_authenticity_token, :only => [:api_read, :api_details, :api_gpx_files]
   before_filter :disable_terms_redirect, :only => [:terms, :save, :logout, :api_details]


@@ -20,32 +20,32 @@ 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?
       render :partial => "terms"
     else
     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?
       render :partial => "terms"
     else

-      @title = t 'user.terms.title'
+      @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
   end
 
   def save
         redirect_to :action => :login, :referer => request.fullpath
       end
     end
   end
 
   def save

-    @title = t 'user.new.title'
+    @title = t "user.new.title"

 
     if params[:decline]
       if @user
         @user.terms_seen = true
 
         if @user.save
 
     if params[:decline]
       if @user
         @user.terms_seen = true
 
         if @user.save

-          flash[:notice] = t 'user.new.terms declined', :url => t('user.new.terms declined url')
+          flash[:notice] = t "user.new.terms declined", :url => t("user.new.terms declined url")

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


@@ -54,16 +54,15 @@ class UserController < ApplicationController
           redirect_to :action => :account, :display_name => @user.display_name
         end
       else
           redirect_to :action => :account, :display_name => @user.display_name
         end
       else

-        redirect_to t('user.terms.declined')
+        redirect_to t("user.terms.declined")

       end
     elsif @user
       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)


@@ -90,11 +89,11 @@ class UserController < ApplicationController
 
           begin
             uri = URI(session[:referer])
 
           begin
             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))
+            %r{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))

             end
           rescue
             # Use default
             end
           rescue
             # Use default


@@ -106,22 +105,22 @@ class UserController < ApplicationController
           else
             session[:token] = @user.tokens.create.token
             Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now
           else
             session[:token] = @user.tokens.create.token
             Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver_now

-            redirect_to :action => 'confirm', :display_name => @user.display_name
+            redirect_to :action => "confirm", :display_name => @user.display_name

           end
         else
           end
         else

-          render :action => 'new', :referer => params[:referer]
+          render :action => "new", :referer => params[:referer]

         end
       end
     end
   end
 
   def account
         end
       end
     end
   end
 
   def account

-    @title = t 'user.account.title'
+    @title = t "user.account.title"

     @tokens = @user.oauth_tokens.authorized
 
     @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


@@ -145,37 +144,35 @@ class UserController < ApplicationController
   def go_public
     @user.data_public = true
     @user.save
   def go_public
     @user.data_public = true
     @user.save

-    flash[:notice] = t 'user.go_public.flash success'
-    redirect_to :controller => 'user', :action => 'account', :display_name => @user.display_name
+    flash[:notice] = t "user.go_public.flash success"
+    redirect_to :controller => "user", :action => "account", :display_name => @user.display_name

   end
 
   def lost_password
   end
 
   def lost_password

-    @title = t 'user.lost_password.title'
+    @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
         token = user.tokens.create
         Notifier.lost_password(user, token).deliver_now
       end
 
       if user
         token = user.tokens.create
         Notifier.lost_password(user, token).deliver_now

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

       else
       else

-        flash.now[:error] = t 'user.lost_password.notice email cannot find'
+        flash.now[:error] = t "user.lost_password.notice email cannot find"

       end
     end
   end
 
   def reset_password
       end
     end
   end
 
   def reset_password

-    @title = t 'user.reset_password.title'
+    @title = t "user.reset_password.title"

 
     if params[:token]
       token = UserToken.find_by_token(params[:token])
 
     if params[:token]
       token = UserToken.find_by_token(params[:token])


@@ -191,13 +188,13 @@ class UserController < ApplicationController
 
           if @user.save
             token.destroy
 
           if @user.save
             token.destroy

-            flash[:notice] = t 'user.reset_password.flash changed'
-            redirect_to :action => 'login'
+            flash[:notice] = t "user.reset_password.flash changed"
+            redirect_to :action => "login"

           end
         end
       else
           end
         end
       else

-        flash[:error] = t 'user.reset_password.flash token bad'
-        redirect_to :action => 'lost_password'
+        flash[:error] = t "user.reset_password.flash token bad"
+        redirect_to :action => "lost_password"

       end
     else
       render :text => "", :status => :bad_request
       end
     else
       render :text => "", :status => :bad_request


@@ -205,7 +202,7 @@ class UserController < ApplicationController
   end
 
   def new
   end
 
   def new

-    @title = t 'user.new.title'
+    @title = t "user.new.title"

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


@@ -218,11 +215,11 @@ 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?
-        render :action => 'new'
+      if @user.openid_url.nil? || @user.invalid?
+        render :action => "new"

       else
         session[:new_user] = @user
       else
         session[:new_user] = @user

-        redirect_to :action => 'terms'
+        redirect_to :action => "terms"

       end
     elsif @user
       # The user is logged in already, so don't show them the signup
       end
     elsif @user
       # The user is logged in already, so don't show them the signup


@@ -230,7 +227,7 @@ class UserController < ApplicationController
       if @referer
         redirect_to @referer
       else
       if @referer
         redirect_to @referer
       else

-        redirect_to :controller => 'site', :action => 'index'
+        redirect_to :controller => "site", :action => "index"

       end
     elsif params.key?(:openid)
       @user = User.new(:email => params[:email],
       end
     elsif params.key?(:openid)
       @user = User.new(:email => params[:email],


@@ -238,7 +235,7 @@ class UserController < ApplicationController
                        :display_name => params[:nickname],
                        :openid_url => params[:openid])
 
                        :display_name => params[:nickname],
                        :openid_url => params[:openid])
 

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

     else
       check_signup_allowed
     end
     else
       check_signup_allowed
     end


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

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

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


@@ -289,14 +286,12 @@ class UserController < ApplicationController
   end
 
   def logout
   end
 
   def logout

-    @title = t 'user.logout.title'
+    @title = t "user.logout.title"

 
     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)


@@ -304,7 +299,7 @@ class UserController < ApplicationController
       if params[:referer]
         redirect_to params[:referer]
       else
       if params[:referer]
         redirect_to params[:referer]
       else

-        redirect_to :controller => 'site', :action => 'index'
+        redirect_to :controller => "site", :action => "index"

       end
     end
   end
       end
     end
   end


@@ -313,11 +308,11 @@ class UserController < ApplicationController
     if request.post?
       token = UserToken.find_by_token(params[:confirm_string])
       if token && token.user.active?
     if request.post?
       token = UserToken.find_by_token(params[:confirm_string])
       if token && token.user.active?

-        flash[:error] = t('user.confirm.already active')
-        redirect_to :action => 'login'
+        flash[:error] = t("user.confirm.already active")
+        redirect_to :action => "login"

       elsif !token || token.expired?
       elsif !token || token.expired?

-        flash[:error] = t('user.confirm.unknown token')
-        redirect_to :action => 'confirm'
+        flash[:error] = t("user.confirm.unknown token")
+        redirect_to :action => "confirm"

       else
         user = token.user
         user.status = "active"
       else
         user = token.user
         user.status = "active"


@@ -333,8 +328,8 @@ class UserController < ApplicationController
           token = nil
         end
 
           token = nil
         end
 

-        if token.nil? or token.user != user
-          flash[:notice] = t('user.confirm.success')
+        if token.nil? || token.user != user
+          flash[:notice] = t("user.confirm.success")

           redirect_to :action => :login, :referer => referer
         else
           token.destroy
           redirect_to :action => :login, :referer => referer
         else
           token.destroy


@@ -346,42 +341,41 @@ 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
 
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
       Notifier.signup_confirm(user, user.tokens.create).deliver_now
     end
   end
 
   def confirm_resend
     if user = User.find_by_display_name(params[:display_name])
       Notifier.signup_confirm(user, user.tokens.create).deliver_now

-      flash[:notice] = t 'user.confirm_resend.success', :email => user.email
+      flash[:notice] = t "user.confirm_resend.success", :email => user.email

     else
     else

-      flash[:notice] = t 'user.confirm_resend.failure', :name => params[:display_name]
+      flash[:notice] = t "user.confirm_resend.failure", :name => params[:display_name]

     end
 
     end
 

-    redirect_to :action => 'login'
+    redirect_to :action => "login"

   end
 
   def confirm_email
     if request.post?
       token = UserToken.find_by_token(params[:confirm_string])
   end
 
   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.email_valid = true
         if @user.save
         @user = token.user
         @user.email = @user.new_email
         @user.new_email = nil
         @user.email_valid = true
         if @user.save

-          flash[:notice] = t 'user.confirm_email.success'
+          flash[:notice] = t "user.confirm_email.success"

         else
           flash[:errors] = @user.errors
         end
         token.destroy
         session[:user] = @user.id
         else
           flash[:errors] = @user.errors
         end
         token.destroy
         session[:user] = @user.id

-        redirect_to :action => 'account', :display_name => @user.display_name
+        redirect_to :action => "account", :display_name => @user.display_name

       else
       else

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

       end
     end
   end
       end
     end
   end


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


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


@@ -422,21 +416,21 @@ 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
           if friend.save

-            flash[:notice] = t 'user.make_friend.success', :name => @new_friend.display_name
+            flash[:notice] = t "user.make_friend.success", :name => @new_friend.display_name

             Notifier.friend_notification(friend).deliver_now
           else
             Notifier.friend_notification(friend).deliver_now
           else

-            friend.add_error(t('user.make_friend.failed', :name => @new_friend.display_name))
+            friend.add_error(t("user.make_friend.failed", :name => @new_friend.display_name))

           end
           end

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

         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :controller => 'user', :action => 'view'
+          redirect_to :controller => "user", :action => "view"

         end
       end
     else
         end
       end
     else


@@ -451,15 +445,15 @@ class UserController < ApplicationController
       if request.post?
         if @user.is_friends_with?(@friend)
           Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{@friend.id}"
       if request.post?
         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
+          flash[:notice] = t "user.remove_friend.success", :name => @friend.display_name

         else
         else

-          flash[:error] = t 'user.remove_friend.not_a_friend', :name => @friend.display_name
+          flash[:error] = t "user.remove_friend.not_a_friend", :name => @friend.display_name

         end
 
         if params[:referer]
           redirect_to params[:referer]
         else
         end
 
         if params[:referer]
           redirect_to params[:referer]
         else

-          redirect_to :controller => 'user', :action => 'view'
+          redirect_to :controller => "user", :action => "view"

         end
       end
     else
         end
       end
     else


@@ -472,28 +466,28 @@ class UserController < ApplicationController
   def set_status
     @this_user.status = params[:status]
     @this_user.save
   def set_status
     @this_user.status = params[:status]
     @this_user.save

-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]

   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @this_user.delete
   end
 
   ##
   # delete a user, marking them as deleted and removing personal data
   def delete
     @this_user.delete

-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]

   end
 
   ##
   # display a list of users matching specified criteria
   def list
     if request.post?
   end
 
   ##
   # 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]
 


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

-private
+  private

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


@@ -514,9 +508,9 @@ private
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
       unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)

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

     else
     else

-      failed_login t('user.login.auth failure')
+      failed_login t("user.login.auth failure")

     end
   end
 
     end
   end
 


@@ -525,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"]


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


@@ -563,14 +557,14 @@ private
           nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first
           email = sreg["email"] || ax["http://axschema.org/contact/email"].first
 
           nickname = sreg["nickname"] || ax["http://axschema.org/namePerson/friendly"].first
           email = sreg["email"] || ax["http://axschema.org/contact/email"].first
 

-          redirect_to :controller => 'user', :action => 'new', :nickname => nickname, :email => email, :openid => identity_url
+          redirect_to :controller => "user", :action => "new", :nickname => nickname, :email => email, :openid => identity_url

         end
       elsif result.missing?
         end
       elsif result.missing?

-        failed_login t('user.login.openid missing provider')
+        failed_login t("user.login.openid missing provider")

       elsif result.invalid?
       elsif result.invalid?

-        failed_login t('user.login.openid invalid')
+        failed_login t("user.login.openid invalid")

       else
       else

-        failed_login t('user.login.auth failure')
+        failed_login t("user.login.auth failure")

       end
     end
   end
       end
     end
   end


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


@@ -601,11 +595,11 @@ private
         user.openid_url = identity_url
         yield user, verified_email
       elsif result.missing?
         user.openid_url = identity_url
         yield user, verified_email
       elsif result.missing?

-        flash.now[:error] = t 'user.login.openid missing provider'
+        flash.now[:error] = t "user.login.openid missing provider"

       elsif result.invalid?
       elsif result.invalid?

-        flash.now[:error] = t 'user.login.openid invalid'
+        flash.now[:error] = t "user.login.openid invalid"

       else
       else

-        flash.now[:error] = t 'user.login.auth failure'
+        flash.now[:error] = t "user.login.auth failure"

       end
     end
   end
       end
     end
   end


@@ -616,12 +610,12 @@ 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
       # somewhat less user friendly.
       # 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
       # somewhat less user friendly.

-      return 'https://www.google.com/accounts/o8/id'
+      return "https://www.google.com/accounts/o8/id"

     else
       return openid_url
     end
     else
       return openid_url
     end


@@ -631,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(%r{https://www.google.com/accounts/o8/id?(.*)}) ||
+      openid_url.match(%r{https://me.yahoo.com/(.*)})

   end
 
   ##
   end
 
   ##


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


@@ -666,7 +660,7 @@ private
   def failed_login(message)
     flash[:error] = message
 
   def failed_login(message)
     flash[:error] = message
 

-    redirect_to :action => 'login', :referer =>  session[:referer]
+    redirect_to :action => "login", :referer =>  session[:referer]

 
     session.delete(:remember_me)
     session.delete(:referer)
 
     session.delete(:remember_me)
     session.delete(:referer)


@@ -675,7 +669,7 @@ private
   ##
   #
   def unconfirmed_login(user)
   ##
   #
   def unconfirmed_login(user)

-    redirect_to :action => 'confirm', :display_name => user.display_name
+    redirect_to :action => "confirm", :display_name => user.display_name

 
     session.delete(:remember_me)
     session.delete(:referer)
 
     session.delete(:remember_me)
     session.delete(:referer)


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


@@ -725,13 +719,13 @@ private
     if user.save
       set_locale
 
     if user.save
       set_locale
 

-      if user.new_email.blank? or user.new_email == user.email
-        flash.now[:notice] = t 'user.account.flash update success'
+      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
 
         if user.valid?
       else
         user.email = user.new_email
 
         if user.valid?

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

 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now
 
           begin
             Notifier.email_confirm(user, user.tokens.create).deliver_now


@@ -752,16 +746,16 @@ 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?
-      flash[:error] = t('user.filter.not_an_administrator')
+    if @user && !@user.administrator?
+      flash[:error] = t("user.filter.not_an_administrator")

 
       if params[:display_name]
 
       if params[:display_name]

-        redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
+        redirect_to :controller => "user", :action => "view", :display_name => params[:display_name]

       else
       else

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

       end
       end

-    elsif not @user
-      redirect_to :controller => 'user', :action => 'login', :referer => request.fullpath
+    elsif !@user
+      redirect_to :controller => "user", :action => "login", :referer => request.fullpath

     end
   end
 
     end
   end
 


@@ -784,7 +778,7 @@ private
   def lookup_user_by_name
     @this_user = User.find_by_display_name(params[:display_name])
   rescue ActiveRecord::RecordNotFound
   def lookup_user_by_name
     @this_user = User.find_by_display_name(params[:display_name])
   rescue ActiveRecord::RecordNotFound

-    redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name] unless @this_user
+    redirect_to :controller => "user", :action => "view", :display_name => params[:display_name] unless @this_user

   end
 
   ##
   end
 
   ##


@@ -814,9 +808,9 @@ private
     if blocked = Acl.no_account_creation(request.remote_ip, domain)
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 
     if blocked = Acl.no_account_creation(request.remote_ip, domain)
       logger.info "Blocked signup from #{request.remote_ip} for #{email}"
 

-      render :action => 'blocked'
+      render :action => "blocked"

     end
 
     end
 

-    not blocked
+    !blocked

   end
 end
   end
 end