From 919c23676940bee3a7b21ec98700ea74152f1615 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Fri, 24 Oct 2014 09:34:05 -0400 Subject: [PATCH] Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3 --- interface/web/mail/mail_domain_dkim_create.php | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/web/mail/mail_domain_dkim_create.php b/interface/web/mail/mail_domain_dkim_create.php index fa1e298..4769735 100644 --- a/interface/web/mail/mail_domain_dkim_create.php +++ b/interface/web/mail/mail_domain_dkim_create.php @@ -124,8 +124,14 @@ } //* get dkim-strength for server_id -$mail_server_id = $app->functions->intval( $app->db->queryOneRecord("SELECT server_id from mail_domain WHERE domain = ?", $_POST['domain']) ); -$dkim_strength = $app->functions->intval( $app->getconf->get_server_config($mail_server_id, 'mail')['dkim_strength'] ); +//$mail_server_id = $app->functions->intval( $app->db->queryOneRecord("SELECT server_id from mail_domain WHERE domain = ?", $_POST['domain']) ); +//$dkim_strength = $app->functions->intval( $app->getconf->get_server_config($mail_server_id, 'mail')['dkim_strength'] ); +$rec = $app->db->queryOneRecord("SELECT server_id from mail_domain WHERE domain = ?", $_POST['domain']); +$mail_server_id = $app->functions->intval($rec['server_id']); +unset ($rec); +$rec = $app->getconf->get_server_config($mail_server_id, 'mail'); +$dkim_strength = $app->functions->intval($rec['dkim_strength']); +unset ($rec); if ( empty($dkim_strength) ) $dkim_strength = 1024; switch ($_POST['action']) { -- Gitblit v1.9.1