From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Thu, 06 Aug 2015 03:18:44 -0400
Subject: [PATCH] - don't set password via remoting if field is empty
---
interface/web/js/mail_domain_dkim.js | 100 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 40 deletions(-)
diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js
index 09a01b3..0e9be0a 100755
--- a/interface/web/js/mail_domain_dkim.js
+++ b/interface/web/js/mail_domain_dkim.js
@@ -32,48 +32,68 @@
* 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) {
+function setRequest() {
+ if (window.XMLHttpRequest) {
+ request = new XMLHttpRequest();
+ } else if (window.ActiveXObject) {
+ try {
+ request = new ActiveXObject('Msxml2.XMLHTTP');
+ }
+ catch (e) {
+ try {
+ request = new ActiveXObject('Microsoft.XMLHTTP');
+ }
+ catch (e) {}
+ }
+ }
+ if (!request) {
+ alert("Error creating XMLHTTP-instance");
+ return false;
+ } else {
+ // jQuery depends on domain-module active / inactive
+ var check = jQuery('#domain_module').val();
+ if ( check == "1" ) {
+ var skillsSelect = document.getElementById("domain");
+ var domain = skillsSelect.options[skillsSelect.selectedIndex].text;
+ } 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 request = false;
+ var selector=jQuery('#dkim_selector').val();
+ var publickey=jQuery('#dkim_public').val();
+ request.open('POST', 'mail/mail_domain_dkim_create.php', true);
+ request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+ request.send('domain='+domain+'&dkim_selector='+selector+'&dkim_public='+publickey+'&client_id='+clientid);
+ request.onreadystatechange = interpretRequest;
+ }
+}
- function setRequest(action,value,privatekey) {
- if (window.XMLHttpRequest) {request = new XMLHttpRequest();}
- else if (window.ActiveXObject) {
- try {request = new ActiveXObject('Msxml2.XMLHTTP');}
- catch (e) {
- try {request = new ActiveXObject('Microsoft.XMLHTTP');}
- catch (e) {}
- }
- }
- if (!request) {
- alert("Error creating XMLHTTP-instance");
- return false;
- } else {
- request.open('POST', 'mail/mail_domain_dkim_create.php', true);
- request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
- request.send('domain='+value+'&action='+action+'&pkey='+privatekey);
- request.onreadystatechange = interpretRequest;
- }
- }
+function interpretRequest() {
+ switch (request.readyState) {
+ 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;
+ }
+ break;
+ default:
+ break;
+ }
+}
- function interpretRequest() {
- switch (request.readyState) {
- case 4:
- if (request.status != 200) {alert("Request done but NOK\nError:"+request.status);}
- else {
- 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;
- }
- break;
- default:
- break;
- }
- }
-
-var serverType = jQuery('#dkim_private').val();
-setRequest('show','{tmpl_var name="domain"}',serverType);
+//setRequest('show');
--
Gitblit v1.9.1