From e6c042331ddae1a5daf25c67ead77601bb9cd612 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Fri, 12 Apr 2019 16:31:17 -0400 Subject: [PATCH 1/2] Do not add bind entries for sub domaines marked for deletion Fixes #328 --- bureau/class/m_bind.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bureau/class/m_bind.php b/bureau/class/m_bind.php index 5403de51..0e448ec5 100644 --- a/bureau/class/m_bind.php +++ b/bureau/class/m_bind.php @@ -224,7 +224,8 @@ class m_bind { domaines_type dt WHERE sd.type=dt.name - AND sd.enable IN ('ENABLE', 'ENABLED') + AND sd.enable IN ('ENABLE', 'ENABLED') + AND sb.web_action NOT IN ('DELETE') ORDER BY ENTRY ;"); $t=""; while ($db->next_record()) { From d2994624395e076a453463c151ca91719234aaa8 Mon Sep 17 00:00:00 2001 From: Kienan Stewart Date: Tue, 23 Apr 2019 12:16:31 -0400 Subject: [PATCH 2/2] Fix typo in table alias causing zone data queries to fail --- bureau/class/m_bind.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bureau/class/m_bind.php b/bureau/class/m_bind.php index 0e448ec5..7c903a47 100644 --- a/bureau/class/m_bind.php +++ b/bureau/class/m_bind.php @@ -225,7 +225,7 @@ class m_bind { WHERE sd.type=dt.name AND sd.enable IN ('ENABLE', 'ENABLED') - AND sb.web_action NOT IN ('DELETE') + AND sd.web_action NOT IN ('DELETE') ORDER BY ENTRY ;"); $t=""; while ($db->next_record()) {