From 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 06 Jan 2015 10:41:32 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc/master' into new-layout-3.1
---
interface/web/js/mail_domain_dkim.js | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js
index fdc7ae5..0b9ea59 100755
--- a/interface/web/js/mail_domain_dkim.js
+++ b/interface/web/js/mail_domain_dkim.js
@@ -31,15 +31,16 @@
This Javascript is invoked by
* mail/templates/mail_domain_edit.htm to show and/or create the key-pair
*/
-var request = false;
-
$('.subsectiontoggle').on('click', function(){
$(this).children().toggleClass('showing').end().next().slideToggle();
});
-function setRequest(action) {
+var request = false;
+
+//function setRequest(action) {
+function setRequest() {
if (window.XMLHttpRequest) {
- request = new XMLHttpRequest();
+ request = new XMLHttpRequest();
} else if (window.ActiveXObject) {
try {
request = new ActiveXObject('Msxml2.XMLHTTP');
@@ -51,7 +52,6 @@
catch (e) {}
}
}
-
if (!request) {
alert("Error creating XMLHTTP-instance");
return false;
@@ -64,12 +64,20 @@
} else {
var domain = jQuery('#domain').val();
}
+
+ // we nedd the client-id to get the dkim-strength of the right mail-server
+ try {
+ var clientid = document.getElementById("client_group_id").selectedIndex; // admin and reseller
+ }
+ catch (e) {
+ var clientid = jQuery('#client_id').val();; // user
+ }
+
var selector=jQuery('#dkim_selector').val();
var publickey=jQuery('#dkim_public').val();
- 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='+domain+'&dkim_selector='+selector+'&dkim_public='+publickey+'&client_id='+clientid);
request.onreadystatechange = interpretRequest;
}
}
@@ -86,10 +94,9 @@
document.getElementsByName('dns_record')[0].value = request.responseXML.getElementsByTagName('dns_record')[0].firstChild.nodeValue;
}
break;
-
default:
break;
}
}
-setRequest('show');
+//setRequest('show');
--
Gitblit v1.9.1