From 09e3312ccaf3215876444c6f3afc08b0c7eea4ce Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Sat, 9 Jun 2018 13:02:43 -0400 Subject: Made formatting more consistent. --- app/controllers/application_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 7548b33..063c173 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -43,7 +43,7 @@ class ApplicationController < ActionController::Base def check_2fa # Over complicated way of asking if the user is logged in as a mod without TOTP enabled while they are not on their login settings screen, logging out, or updating their login settings. - if current_user && current_user.mod? && !current_user.totp_enabled? && (!(controller_name == "users") || !(action_name == "edit_login")) && !(controller_name == "sessions" && action_name == "destroy") && !(action_name == "update_login") + if current_user && current_user.mod? && !current_user.totp_enabled? && !(controller_name == "users" && action_name == "edit_login") && !(controller_name == "sessions" && action_name == "destroy") && !(controller_name == "users" && action_name == "update_login") flash[:alert] = "Due to your staff rank, you are required to enable 2FA." redirect_to :controller => "users", :action => "edit_login", :id => current_user.id end -- cgit v1.2.3