kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

[fix] (for 3.5) delete DMARC and SPF and DKIM in cascade when del_mx_domain

This commit is contained in:
Benjamin Sonntag 2018-10-23 19:21:22 +02:00
parent ca0ed3dd40
commit b50f028e0e
1 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bureau/class/m_mail.php
View File

@ -466,12 +466,17 @@ ORDER BY
} }
} }
$db->query("SELECT domaine FROM domaines WHERE id= ? ;", array($dom_id)); $db->query("SELECT domaine FROM domaines WHERE id= ? ;", array($dom_id));
if ($db->next_record()) { if (!$db->next_record()) {
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine= ? AND type='txt' AND (sub='' AND valeur LIKE 'v=spf1 %') OR (sub='_dmarc' AND valeur LIKE 'v=dmarc1;%');", array($db->Record["domaine"])); return false;
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine= ? AND (type='defmx' OR type='defmx2');", array($db->Record["domaine"]));
$db->query("UPDATE domaines SET dns_action='UPDATE' WHERE id= ? ;", array($dom_id));
} }
$domain=$db->Record["domaine"];
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine= ? AND (type='defmx' OR type='defmx2');", array($domain));
$this->del_dns_dmarc($domain);
$this->del_dns_spf($domain);
$this->dkim_del($domain);
$db->query("UPDATE domaines SET dns_action='UPDATE' WHERE id= ? ;", array($dom_id));
return true; return true;
} }
@ -1052,6 +1057,16 @@ ORDER BY
$db->query("UPDATE domaines SET dns_action='UPDATE' WHERE domaine= ?;", array($domain)); $db->query("UPDATE domaines SET dns_action='UPDATE' WHERE domaine= ?;", array($domain));
} }
// ------------------------------------------------------------
/**
* delete the SPF entries in the sub_domaine table for a domain
* called by del_domain or del_mx_domain by hooks :
*/
function del_dns_spf($domain) {
global $db;
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine= ? AND type='txt' AND sub='' AND valeur LIKE 'v=spf1 %';", array($domain));
}
// ------------------------------------------------------------ // ------------------------------------------------------------
/** /**
@ -1087,6 +1102,17 @@ ORDER BY
} }
// ------------------------------------------------------------
/**
* delete the DMARC entries in the sub_domaine table for a domain
* called by del_domain or del_mx_domain by hooks :
*/
function del_dns_dmarc($domain) {
global $db;
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine= ? AND type='txt' AND sub='' AND valeur LIKE 'v=dmarc1 %';", array($domain));
}
/** Manage DKIM when adding / removing a domain MX management */ /** Manage DKIM when adding / removing a domain MX management */
var $shouldreloaddkim; var $shouldreloaddkim;
@ -1113,7 +1139,7 @@ ORDER BY
$this->dkim_add($domain["domaine"],$domain["compte"]); $this->dkim_add($domain["domaine"],$domain["compte"]);
} }
foreach($del as $domain) { foreach($del as $domain) {
$this->dkim_del($domain["domaine"],$domain["compte"]); $this->dkim_del($domain["domaine"]);
} }
} }
@ -1170,7 +1196,7 @@ ORDER BY
/** /**
* Delete a domain from OpenDKIM configuration * Delete a domain from OpenDKIM configuration
*/ */
function dkim_del($domain,$uid) { function dkim_del($domain) {
$target_dir = "/etc/opendkim/keys/$domain"; $target_dir = "/etc/opendkim/keys/$domain";
if (file_exists($target_dir)) { if (file_exists($target_dir)) {
$this->shouldreloaddkim=true; $this->shouldreloaddkim=true;