From 76be2b7047ab4573c1225a50a9cbc36330cd4140 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 01 Apr 2014 10:08:06 -0400
Subject: [PATCH] fixed mail_plugin_dkim.inc.php and add dkim-selector to dns
---
interface/web/dns/lib/lang/tr_dns_dkim.lng | 1
interface/web/dns/lib/lang/hu_dns_dkim.lng | 1
interface/web/dns/lib/lang/en_dns_dkim.lng | 1
interface/web/dns/lib/lang/ja_dns_dkim.lng | 1
interface/web/dns/templates/dns_dkim_edit.htm | 6 ++
interface/web/dns/lib/lang/ru_dns_dkim.lng | 1
interface/web/dns/lib/lang/bg_dns_dkim.lng | 1
interface/web/dns/lib/lang/fr_dns_dkim.lng | 1
interface/web/dns/lib/lang/sk_dns_dkim.lng | 1
interface/web/dns/dns_wizard.php | 8 ++-
interface/web/dns/lib/lang/ar_dns_dkim.lng | 1
interface/web/dns/lib/lang/id_dns_dkim.lng | 1
interface/web/dns/lib/lang/nl_dns_dkim.lng | 1
interface/web/dns/lib/lang/hr_dns_dkim.lng | 1
interface/web/dns/dns_dkim_edit.php | 8 ++-
server/plugins-available/mail_plugin_dkim.inc.php | 4 +-
interface/web/dns/lib/lang/de_dns_dkim.lng | 1
interface/web/dns/lib/lang/it_dns_dkim.lng | 1
interface/web/dns/lib/lang/br_dns_dkim.lng | 1
interface/web/dns/lib/lang/es_dns_dkim.lng | 1
interface/web/dns/dns_dkim_get.php | 21 ++--------
interface/web/dns/lib/lang/cz_dns_dkim.lng | 1
interface/web/js/dns_dkim.js | 1
interface/web/dns/lib/lang/fi_dns_dkim.lng | 1
interface/web/dns/lib/lang/se_dns_dkim.lng | 1
25 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/interface/web/dns/dns_dkim_edit.php b/interface/web/dns/dns_dkim_edit.php
index a0bd4f8..71741d0 100644
--- a/interface/web/dns/dns_dkim_edit.php
+++ b/interface/web/dns/dns_dkim_edit.php
@@ -97,9 +97,10 @@
$this->dataRecord["server_id"] = $soa["server_id"];
// add dkim-settings to the public-key in the txt-record
- if (!empty($this->dataRecord['data'])) $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
- $this->dataRecord['name']='default._domainkey.'.$this->dataRecord['name'];
-
+ if (!empty($this->dataRecord['data'])) {
+ $this->dataRecord['data']='v=DKIM1; t=s; p='.$this->dataRecord['data'];
+ $this->dataRecord['name']=$this->dataRecord['selector'].'._domainkey.'.$this->dataRecord['name'];
+ }
// Update the serial number and timestamp of the RR record
$soa = $app->db->queryOneRecord("SELECT serial FROM dns_rr WHERE id = ?", $this->id);
$this->dataRecord["serial"] = $app->validate_dns->increase_serial($soa["serial"]);
@@ -109,6 +110,7 @@
$check=$app->db->queryOneRecord("SELECT * FROM dns_rr WHERE zone = ? AND type = ? AND data = ? AND name = ?", $this->dataRecord['zone'], $this->dataRecord['type'], $this->dataRecord['data'], $this->dataRecord['name']);
if ($check!='') $app->tform->errorMessage .= $app->tform->wordbook["record_exists_txt"];
if (empty($this->dataRecord['data'])) $app->tform->errorMessage .= $app->tform->wordbook["dkim_disabled_txt"];
+
parent::onSubmit();
}
diff --git a/interface/web/dns/dns_dkim_get.php b/interface/web/dns/dns_dkim_get.php
index 1bfa511..9c33ce2 100644
--- a/interface/web/dns/dns_dkim_get.php
+++ b/interface/web/dns/dns_dkim_get.php
@@ -67,33 +67,20 @@
return $vars;
}
-/**
-* This function formats the public-key
-* @param array $pubkey
-* @return string public-key
-*/
-function pub_key($pubkey) {
- $public_key='';
- foreach($pubkey as $values) $public_key=$public_key.$values;
- return $public_key;
-}
-
$_POST=getRealPost();
if (ctype_digit($_POST['zone'])) {
// Get the parent soa record of the domain
- $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? AND ".$app->tform->getAuthSQL('r'), $_POST['zone']);
+ $soa = $app->db->queryOneRecord("SELECT * FROM dns_soa WHERE id = ? and ?'", $app->db->quote($_POST['zone']), $app->tform->getAuthSQL('r'));
- $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ".$app->tform->getAuthSQL('r'), substr_replace($soa['origin'],'',-1));
-
- $public_key=pub_key($public_key);
-
- $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$public_key);
+ $sql=$app->db->queryOneRecord("SELECT dkim_public, dkim_selector FROM mail_domain WHERE domain = ? AND dkim = 'Y' AND ?", substr_replace($soa['origin'],'',-1), $app->tform->getAuthSQL('r'));
+ $public_key=str_replace(array('-----BEGIN PUBLIC KEY-----','-----END PUBLIC KEY-----',"\r","\n"),'',$sql['dkim_public']);
echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
echo "<formatname>\n";
echo "<data>".$public_key."</data>\n";
echo "<name>".$soa['origin']."</name>\n";
+ echo "<selector>".$sql['dkim_selector']."</selector>\n";
echo "</formatname>\n";
}
?>
diff --git a/interface/web/dns/dns_wizard.php b/interface/web/dns/dns_wizard.php
index 844686e..15f86df 100644
--- a/interface/web/dns/dns_wizard.php
+++ b/interface/web/dns/dns_wizard.php
@@ -245,10 +245,12 @@
if($_POST['ns2'] != '') $tpl_content = str_replace('{NS2}', $_POST['ns2'], $tpl_content);
if($_POST['email'] != '') $tpl_content = str_replace('{EMAIL}', $_POST['email'], $tpl_content);
if(isset($_POST['dkim']) && preg_match('/^[\w\.\-\/]{2,255}\.[a-zA-Z0-9\-]{2,30}[\.]{0,1}$/', $_POST['domain'])) {
- $public_key=$app->db->queryOneRecord("SELECT dkim_public FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
+ $sql = $app->db->queryOneRecord("SELECT dkim_public, dkim_selecotr FROM mail_domain WHERE domain = ? AND dkim = 'y' AND ".$app->tform->getAuthSQL('r'), $_POST['domain']);
+ $public_key = $sql['dkim_public'];
if ($public_key!='') {
- $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key['dkim_public']);
- $tpl_content .= "\n".'TXT|default._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
+ if (empty($sql['dkim_selector'])) $sql['dkim_selector'] = 'default';
+ $dns_record=str_replace(array("\r\n", "\n", "\r", "-----BEGIN PUBLIC KEY-----", "-----END PUBLIC KEY-----"), '', $public_key);
+ $tpl_content .= "\n".'TXT|'.$sql['dkim_selector'].'._domainkey.'.$_POST['domain'].'.|v=DKIM1; t=s; p='.$dns_record;
}
}
diff --git a/interface/web/dns/lib/lang/ar_dns_dkim.lng b/interface/web/dns/lib/lang/ar_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ar_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ar_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/bg_dns_dkim.lng b/interface/web/dns/lib/lang/bg_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/bg_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/bg_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/br_dns_dkim.lng b/interface/web/dns/lib/lang/br_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/br_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/br_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/cz_dns_dkim.lng b/interface/web/dns/lib/lang/cz_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/cz_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/cz_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/de_dns_dkim.lng b/interface/web/dns/lib/lang/de_dns_dkim.lng
index d1ba493..f139762 100644
--- a/interface/web/dns/lib/lang/de_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/de_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb["limit_dns_record_txt"] = 'Die max. Anzahl von DNS Eintraegen fuer den Account ist erreicht.';
$wb["no_zone_perm"] = 'Fehlende Berechtigung zum Hinzufuegen eines Eintrags zur DNS-Zone.';
$wb['ttl_range_error'] = 'Min. TTL time ist 60 Sekunden.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/en_dns_dkim.lng b/interface/web/dns/lib/lang/en_dns_dkim.lng
index 62025f8..b89f024 100644
--- a/interface/web/dns/lib/lang/en_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/en_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb["limit_dns_record_txt"] = 'The max. number of DNS records for your account is reached.';
$wb["no_zone_perm"] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/es_dns_dkim.lng b/interface/web/dns/lib/lang/es_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/es_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/es_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/fi_dns_dkim.lng b/interface/web/dns/lib/lang/fi_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/fi_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/fi_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/fr_dns_dkim.lng b/interface/web/dns/lib/lang/fr_dns_dkim.lng
index 6b2c687..19dd5ea 100644
--- a/interface/web/dns/lib/lang/fr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/fr_dns_dkim.lng
@@ -6,4 +6,5 @@
$wb["limit_dns_record_txt"] = 'Le nombre max. d\'enregistrement DNS pour votre compte à été atteint.';
$wb["no_zone_perm"] = 'Vous n\'avez pas la permission d\'ajouter un enregistrement à cette Zone DNS.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/hr_dns_dkim.lng b/interface/web/dns/lib/lang/hr_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/hr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/hr_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/hu_dns_dkim.lng b/interface/web/dns/lib/lang/hu_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/hu_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/hu_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/id_dns_dkim.lng b/interface/web/dns/lib/lang/id_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/id_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/id_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/it_dns_dkim.lng b/interface/web/dns/lib/lang/it_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/it_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/it_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/ja_dns_dkim.lng b/interface/web/dns/lib/lang/ja_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ja_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ja_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/nl_dns_dkim.lng b/interface/web/dns/lib/lang/nl_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/nl_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/nl_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/ru_dns_dkim.lng b/interface/web/dns/lib/lang/ru_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/ru_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/ru_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/se_dns_dkim.lng b/interface/web/dns/lib/lang/se_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/se_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/se_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/sk_dns_dkim.lng b/interface/web/dns/lib/lang/sk_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/sk_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/sk_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/lib/lang/tr_dns_dkim.lng b/interface/web/dns/lib/lang/tr_dns_dkim.lng
index 5ed8bfa..b7a2b9b 100644
--- a/interface/web/dns/lib/lang/tr_dns_dkim.lng
+++ b/interface/web/dns/lib/lang/tr_dns_dkim.lng
@@ -7,4 +7,5 @@
$wb['limit_dns_record_txt'] = 'The max. number of DNS records for your account is reached.';
$wb['no_zone_perm'] = 'You do not have the permission to add a record to this DNS zone.';
$wb['ttl_range_error'] = 'Min. TTL time is 60 seconds.';
+$wb['selector_txt'] = 'DKIM-Selector';
?>
diff --git a/interface/web/dns/templates/dns_dkim_edit.htm b/interface/web/dns/templates/dns_dkim_edit.htm
index 3f89320..052f6d5 100644
--- a/interface/web/dns/templates/dns_dkim_edit.htm
+++ b/interface/web/dns/templates/dns_dkim_edit.htm
@@ -6,8 +6,12 @@
<fieldset class="inlineLabels">
<div class="ctrlHolder">
<label for="data">{tmpl_var name='public_key_txt'}</label>
- <textarea name="data" id="data" readonly>{tmpl_var name='public_key'}</textarea>
+ <textarea name="data" id="data" >{tmpl_var name='public_key'}</textarea>
</div>
+ <div class="ctrlHolder">
+ <label for="selector">{tmpl_var name='selector_txt'}</label>
+ <input name="selector" id="selector" value="{tmpl_var name='selector'}" size="20" maxlength="63" type="text" class="textInput" />
+ </div>
<div class="ctrlHolder">
<label for="ttl">{tmpl_var name='ttl_txt'}</label>
<input name="ttl" id="ttl" value="{tmpl_var name='ttl'}" size="10" maxlength="10" type="text" class="textInput" />
diff --git a/interface/web/js/dns_dkim.js b/interface/web/js/dns_dkim.js
index 2811dbc..58f8dcf 100644
--- a/interface/web/js/dns_dkim.js
+++ b/interface/web/js/dns_dkim.js
@@ -60,6 +60,7 @@
else {
document.getElementsByName('data')[0].value = request.responseXML.getElementsByTagName('data')[0].firstChild.nodeValue;
document.getElementsByName('name')[0].value = request.responseXML.getElementsByTagName('name')[0].firstChild.nodeValue;
+ document.getElementsByName('selector')[0].value = request.responseXML.getElementsByTagName('selector')[0].firstChild.nodeValue;
}
break;
default:
diff --git a/server/plugins-available/mail_plugin_dkim.inc.php b/server/plugins-available/mail_plugin_dkim.inc.php
index 2617d1e..0f0f6ef 100644
--- a/server/plugins-available/mail_plugin_dkim.inc.php
+++ b/server/plugins-available/mail_plugin_dkim.inc.php
@@ -205,7 +205,7 @@
* This function adds the entry to the amavisd-config
* @param string $key_domain mail-domain
*/
- function add_to_amavis($key_domain) {
+ function add_to_amavis($key_domain, $selector, $old_selector) {
global $app, $mail_config;
if (empty($selector)) $selector = 'default';
@@ -287,7 +287,7 @@
if ( substr($mail_config['dkim_path'], strlen($mail_config['dkim_path'])-1) == '/' )
$mail_config['dkim_path'] = substr($mail_config['dkim_path'], 0, strlen($mail_config['dkim_path'])-1);
if ($this->write_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['dkim_private'], $data['new']['domain'])) {
- if ($this->add_to_amavis($data['new']['domain'])) {
+ if ($this->add_to_amavis($data['new']['domain'], $data['new']['dkim_selector'], $data['old']['dkim_selector'] )) {
$this->restart_amavis();
} else {
$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
--
Gitblit v1.9.1