Commit f3de95cb authored by Florian Schaal's avatar Florian Schaal
Browse files

re-creation for dkim keys fails (Fixes #5061)

parent a25fa66c

interface/web/mail/ajax_get_json.php

+4 −6
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ $domain_id = $_GET['domain_id']; 
if($type == 'create_dkim' && $domain_id != ''){

	$dkim_public = $_GET['dkim_public'];

	$dkim_selector = $_GET['dkim_selector'];

	$client_id = $_GET['client_group_id'];

	$server_id = $_GET['server_id'];



	$domain=@(is_numeric($domain_id))?$app->db->queryOneRecord("SELECT domain FROM domain WHERE domain_id = ?", $domain_id)['domain']:$domain_id;

	$maildomain = $app->db->queryOneRecord("SELECT domain FROM mail_domain WHERE domain = ?", $domain)['domain'];



	$rec = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = ?", $domain);

	$server_id = $rec['server_id'];

	$maildomain = $rec['domain'];

	unset($rec);

	$mail_config = $app->getconf->get_server_config($server_id, 'mail');

	$dkim_strength = $app->functions->intval($mail_config['dkim_strength']);

	if ($dkim_strength=='') $dkim_strength = 2048;
@@ -75,7 +74,6 @@ if($type == 'create_dkim' && $domain_id != ''){ 
		} else {

			$selector = 'invalid domain or selector';

		}

	} else {

		unset($dkim_public);

		exec('echo '.escapeshellarg($dkim_private).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);

		foreach($pubkey as $values) $dkim_public=$dkim_public.$values."\n";

interface/web/mail/templates/mail_domain_edit.htm

+0 −7
Original line number Diff line number Diff line
@@ -101,9 +101,6 @@ 
                <label for="dkim_private" class="col-sm-3 control-label">{tmpl_var name='dkim_private_txt'}</label>

                <div class="col-sm-9"><textarea class="form-control" name="dkim_private" id="dkim_private" rows='10' cols='30'>{tmpl_var name='dkim_private'}</textarea></div>

              </div>

<!--

				<a class="btn btn-default formbutton-default" href="javascript:setRequest('create')" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>

-->

				<a class="btn btn-default formbutton-default" id="dkim-button" value="{tmpl_var name='dkim_generate_txt'}">{tmpl_var name='dkim_generate_txt'}</a>

		<div class="form-group">

                <div class="col-sm-9"><textarea class="form-control" name="dkim_public" style="display:none;" id="dkim_public" rows='5' cols='30' readonly>{tmpl_var name='dkim_public'}</textarea></div>
@@ -129,14 +126,10 @@ 


	function getDKIM() {

		var domain_id = jQuery('#domain').val();

		var client_group_id = jQuery('#client_group_id').val();

		var server_id = jQuery('#server_id').val();

		var dkim_selector = jQuery('#dkim_selector').val();

		var dkim_public = jQuery('#dkim_public').val();

		jQuery.getJSON('mail/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {

			domain_id : domain_id,

			client_group_id : client_group_id,

			server_id : server_id,

			dkim_public : dkim_public,

			dkim_selector : dkim_selector,

			type : "create_dkim"