Tidy up a few things

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a22bc13edd9500a804fb7d2e467e70534078f87c..34987c93880f87141084d5e7bca4c8d62e7f5c60 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -99,16 +99,18 @@ class ApplicationController < ActionController::Base
       end
     end
 
       end
     end
 

-    # check if the user has been banned
-    unless @user.nil? or @user.active_blocks.empty?
-      # NOTE: need slightly more helpful message than this.
-      render :text => t('application.setup_user_auth.blocked'), :status => :forbidden
-    end
-    # if the user hasn't seen the contributor terms then don't
-    # allow editing - they have to go to the web site and see
-    # (but can decline) the CTs to continue.
-    if REQUIRE_TERMS_SEEN
-      unless @user.nil? or @user.terms_seen
+    # have we identified the user?
+    if @user
+      # check if the user has been banned
+      if not  @user.active_blocks.empty?
+        # NOTE: need slightly more helpful message than this.
+        render :text => t('application.setup_user_auth.blocked'), :status => :forbidden
+      end
+
+      # if the user hasn't seen the contributor terms then don't
+      # allow editing - they have to go to the web site and see
+      # (but can decline) the CTs to continue.
+      if REQUIRE_TERMS_SEEN and not @user.terms_seen

         render :text => t('application.setup_user_auth.need_to_see_terms'), :status => :forbidden
       end
     end
         render :text => t('application.setup_user_auth.need_to_see_terms'), :status => :forbidden
       end
     end