From 559b657f9fc6a5374de9b7b1caf20abd4e308d76 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 13 Oct 2014 06:38:11 -0400
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/js/mail_domain_dkim.js | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js
index c15f856..09a01b3 100755
--- a/interface/web/js/mail_domain_dkim.js
+++ b/interface/web/js/mail_domain_dkim.js
@@ -31,6 +31,13 @@
This Javascript is invoked by
* mail/templates/mail_domain_edit.htm to show and/or create the key-pair
*/
+
+
+$('.subsectiontoggle').on('click', function(){
+ $(this).children().toggleClass('showing').end().next().slideToggle();
+});
+
+
var request = false;
function setRequest(action,value,privatekey) {
@@ -46,13 +53,9 @@
alert("Error creating XMLHTTP-instance");
return false;
} else {
- var domain=encodeURIComponent(document.getElementById("domain").value)
- var selector=encodeURIComponent(document.getElementById("dkim_selector").value)
- var publickey=encodeURIComponent(document.getElementById("dkim_public").value)
- var privatekey=encodeURIComponent(document.getElementById("dkim_private").value)
request.open('POST', 'mail/mail_domain_dkim_create.php', true);
request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- request.send('domain='+domain+'&action='+action+'&dkim_selector='+selector+'&dkim_public='+publickey+'&dkim_private='+privatekey);
+ request.send('domain='+value+'&action='+action+'&pkey='+privatekey);
request.onreadystatechange = interpretRequest;
}
}
@@ -62,15 +65,15 @@
case 4:
if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);}
else {
- document.getElementsByName('dkim_selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
document.getElementsByName('dkim_private')[0].value = request.responseXML.getElementsByTagName('privatekey')[0].firstChild.nodeValue;
- document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
- document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
+ document.getElementsByName('dkim_public')[0].value = request.responseXML.getElementsByTagName('publickey')[0].firstChild.nodeValue;
+ document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
}
break;
default:
break;
}
}
+
var serverType = jQuery('#dkim_private').val();
setRequest('show','{tmpl_var name="domain"}',serverType);
--
Gitblit v1.9.1