From 72b809fb92d2f35c5afa41ff8c55a8c94867b6af Mon Sep 17 00:00:00 2001
From: c12simple <c12simple@gmail.com>
Date: Wed, 18 Mar 2015 17:06:39 +0100
Subject: [PATCH] Fix login form display in authfront.otp.

---
 core/src/plugins/authfront.otp/class.OTP_LoginForm.js | 7 +++----
 core/src/plugins/authfront.otp/manifest.xml           | 6 ++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/src/plugins/authfront.otp/class.OTP_LoginForm.js b/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
index 09e1fa6ff7..f373bc280b 100644
--- a/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
+++ b/core/src/plugins/authfront.otp/class.OTP_LoginForm.js
@@ -30,10 +30,9 @@ Class.create("OTP_LoginForm", {
         if(!obj_loginform.down(("#add_otp_notion"))){
             obj_loginform.insert({bottom:otpEnabled});
         }
-
     }
 });
 var enableModifyGUI = ajaxplorer.getPluginConfigs("authfront.otp")._object.MODIFY_LOGIN_SCREEN;
-if(enableModifyGUI){
-    window.CASFORM = new OTP_LoginForm();
-}
+if(!enableModifyGUI){
+    window.OTPFORM = new OTP_LoginForm();
+}
\ No newline at end of file
diff --git a/core/src/plugins/authfront.otp/manifest.xml b/core/src/plugins/authfront.otp/manifest.xml
index 2fc0eefe1f..4a70123d8a 100644
--- a/core/src/plugins/authfront.otp/manifest.xml
+++ b/core/src/plugins/authfront.otp/manifest.xml
@@ -9,6 +9,7 @@
     <client_settings>
         <resources>
             <i18n namespace="authfront.otp" path="plugins/authfront.otp/i18n"/>
+            <js className="OTP_LoginForm" file="plugins/authfront.otp/class.OTP_LoginForm.js" autoload="true"/>
         </resources>
     </client_settings>
     <server_settings>
@@ -33,6 +34,11 @@
             <script>
                   document.observe("ajaxplorer:afterApply-login", function(){
                     var f= modal.getForm();
+
+                    var enableModifyGUI = ajaxplorer.getPluginConfigs("authfront.otp")._object.MODIFY_LOGIN_SCREEN;
+
+                    if(!enableModifyGUI) return;
+
                     if(f.down('input[name="otp_code"]')){
                         return;
                     }