From 21cdaaaa73d0c73869a6463f179ff47364260b7c Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Thu, 30 Oct 2014 12:50:50 -0400
Subject: [PATCH] fixed template and query in mail_domain_dkim.js

---
 interface/web/mail/templates/mail_domain_edit.htm |    2 +-
 interface/web/js/mail_domain_dkim.js              |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/js/mail_domain_dkim.js b/interface/web/js/mail_domain_dkim.js
index 635bca0..fdc7ae5 100755
--- a/interface/web/js/mail_domain_dkim.js
+++ b/interface/web/js/mail_domain_dkim.js
@@ -66,7 +66,7 @@
 		}
 		var selector=jQuery('#dkim_selector').val();
 		var publickey=jQuery('#dkim_public').val();
-		var privatekey=jQuery('#dkim_private').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);
diff --git a/interface/web/mail/templates/mail_domain_edit.htm b/interface/web/mail/templates/mail_domain_edit.htm
index 8c1f848..dbd5c6e 100755
--- a/interface/web/mail/templates/mail_domain_edit.htm
+++ b/interface/web/mail/templates/mail_domain_edit.htm
@@ -82,12 +82,12 @@
                     {tmpl_var name='active'}
                 </div>
             </div>
-            <div class="subsectiontoggle"><span></span>{tmpl_var name='dkim_settings_txt'}<em></em></div>
 			<tmpl_if name="domain_module">
 				<input type="hidden" name="domain_module" value="1" id="domain_module" />
 			<tmpl_else>
 				<input type="hidden" name="domain_module" value="0" id="domain_module" />
 			</tmpl_if>
+            <div class="subsectiontoggle"><span></span>{tmpl_var name='dkim_settings_txt'}<em></em></div>
             <div style="display:none;">
               <div class="ctrlHolder">
                 <p class="label">{tmpl_var name='dkim_txt'}</p>

--
Gitblit v1.9.1