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

fixing dmarc subdomain

This commit is contained in:
Benjamin Sonntag 2015-07-31 11:57:29 +02:00
parent b0b0fa408e
commit 5a108d67b9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bureau/class/m_mail.php
View File

@ -453,7 +453,7 @@ ORDER BY
} }
$db->query("SELECT domaine FROM domaines WHERE id=$domain_id;"); $db->query("SELECT domaine FROM domaines WHERE id=$domain_id;");
if ($db->next_record()) { if ($db->next_record()) {
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine='".addslashes($db->Record["domaine"])."' AND type='txt' AND sub='' AND (valeur LIKE 'v=spf1 %' OR valeur LIKE 'v=dmarc1;%');"); $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE domaine='".addslashes($db->Record["domaine"])."' AND type='txt' AND (sub='' AND valeur LIKE 'v=spf1 %') OR (sub='_dmarc' AND valeur LIKE 'v=dmarc1;%');");
$db->query("UPDATE domaines SET dns_action='UPDATE' WHERE id=$domain_id;"); $db->query("UPDATE domaines SET dns_action='UPDATE' WHERE id=$domain_id;");
} }
@ -996,14 +996,14 @@ ORDER BY
$dmarc=str_replace("%%USERMAIL%%",$login."@".$L_FQDN,$dmarc); $dmarc=str_replace("%%USERMAIL%%",$login."@".$L_FQDN,$dmarc);
// Search for the record in sub_domaines table // Search for the record in sub_domaines table
$db->query("SELECT * FROM sub_domaines WHERE compte=$uid AND domaine='".addslashes($domain)."' AND sub='' AND type='txt' AND valeur LIKE 'v=dmarc1;%' AND web_action!='DELETE';"); $db->query("SELECT * FROM sub_domaines WHERE compte=$uid AND domaine='".addslashes($domain)."' AND sub='_dmarc' AND type='txt' AND valeur LIKE 'v=dmarc1;%' AND web_action!='DELETE';");
if ($db->next_record()) { if ($db->next_record()) {
if ($previous!==-1 && $db->Record["valeur"]=="v=dmarc1;".$dmarc) { if ($previous!==-1 && $db->Record["valeur"]=="v=dmarc1;".$dmarc) {
return; // skip, no change asked. return; // skip, no change asked.
} }
$db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE id='".$db->Record["id"]."';"); $db->query("UPDATE sub_domaines SET web_action='DELETE' WHERE id='".$db->Record["id"]."';");
} }
$db->query("INSERT INTO sub_domaines SET compte=$uid, domaine='".addslashes($domain)."', sub='', type='txt', valeur='".addslashes("v=dmarc1;".$dmarc)."', web_action='UPDATE';"); $db->query("INSERT INTO sub_domaines SET compte=$uid, domaine='".addslashes($domain)."', sub='_dmarc', type='txt', valeur='".addslashes("v=dmarc1;".$dmarc)."', web_action='UPDATE';");
$db->query("UPDATE domaines SET dns_action='UPDATE' WHERE domaine='".addslashes($domain)."';"); $db->query("UPDATE domaines SET dns_action='UPDATE' WHERE domaine='".addslashes($domain)."';");
} }