move check license to action controler

app/controllers/concerns/login_verification.rb

@@ -53,16 +53,4 @@ module LoginVerification
   def render_unauthorized
     redirect_to root_path
   end
-
-  private
-  def check_license
-    License.check_license_file 
-  end
-
-  def check_installation
-    if current_company.nil?
-      redirect_to install_path
-    end
-  end
-
 end

config/initializers/action_controller.rb

@@ -20,11 +20,11 @@ class ActionController::Base
       end      
     else         
       #check for license file
-      # if check_license
-      #   current_license(ENV["SX_PROVISION_URL"])
-      # else
-      #   redirect_to activate_path
-      # end      
+      if check_license
+        current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
+      end      
     end    
   end
 
@@ -50,6 +50,16 @@ class ActionController::Base
     end
   end
 
+  def check_license
+    License.check_license_file 
+  end
+
+  def check_installation
+    if current_company.nil?
+      redirect_to install_path
+    end
+  end
+
   def website_connection(license)
     default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
     :username => license.dbusername, :password => license.dbpassword)