Merge remote-tracking branch 'origin/develop' into develop

Author: cdujeu

core/src/plugins/authfront.otp/class.OTP_LoginForm.js

@@ -24,15 +24,33 @@ Class.create("OTP_LoginForm", {
     },
     observer: function(){
         // string
-        var otpEnabled = '<span id="add_otp_notion" style=" font-size: 16px;"> * OTP enabled</span>';
+        var enableModifyGUI = pydio.getPluginConfigs("authfront.otp").get("MODIFY_LOGIN_SCREEN");
+        if(enableModifyGUI){
+            var f= modal.getForm();
 
-        var obj_loginform = $("login_form");
-        if(!obj_loginform.down(("#add_otp_notion"))){
-            obj_loginform.insert({bottom:otpEnabled});
+            if(!f.down('input[name="otp_code"]')){
+                try{
+                    var el = f.down('input[name="password"]').up("div.SF_element");
+                    var clone = el.cloneNode(true);
+                    el.insert({after:clone});
+                    var newField = clone.down('input[name="password"]');
+                    newField.writeAttribute('name', 'otp_code');
+                    newField.writeAttribute('data-ajxpLoginAdditionalParameter', 'true');
+                    clone.down('div.SF_label').update('Unique Code (6 digits)');
+                }catch(e){
+                    if(console) console.log('Error while replacing OTP field', e);
+                }}
+        }
+        else{
+            var f= modal.getForm();
+            if(f.down('input[name="otp_code"]')){
+                f.remove(f.down('input[name="otp_code"]'));
+            }
+            var otpEnabled = '<span id="add_otp_notion" style=" font-size: 16px;"> * OTP enabled</span>';
+            if(!f.down(("#add_otp_notion"))){
+                f.insert({bottom:otpEnabled});
+            }
         }
     }
 });
-var enableModifyGUI = pydio.getPluginConfigs("authfront.otp").get("MODIFY_LOGIN_SCREEN");
-if(!enableModifyGUI){
-    window.OTPFORM = new OTP_LoginForm();
-}
+window.OTPFORM = new OTP_LoginForm();

core/src/plugins/authfront.otp/manifest.xml

@@ -31,30 +31,7 @@
         <external_file filename="plugins/core.auth/standard_auth_actions.xml" include="actions/*" exclude=""/>
         <client_configs>
             <template element="ajxp_desktop" name="otp_script" position="bottom"><![CDATA[
-            <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;
-                    }
-                    try{
-                        var el = f.down('input[name="password"]').up("div.SF_element");
-                        var clone = el.cloneNode(true);
-                        el.insert({after:clone});
-                        var newField = clone.down('input[name="password"]');
-                        newField.writeAttribute('name', 'otp_code');
-                        newField.writeAttribute('data-ajxpLoginAdditionalParameter', 'true');
-                        clone.down('div.SF_label').update('Unique Code (6 digits)');
-                    }catch(e){
-                        if(console) console.log('Error while replacing OTP field', e);
-                    }
-                  });
-            </script>
+            <script></script>
             ]]></template>
         </client_configs>
     </registry_contributions>