From 2526512069f222c5139969a766ae00ff8dbea23a Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:39:01 +0200 Subject: [PATCH 1/8] Update stretch.xml --- lib/configfiles/stretch.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/stretch.xml b/lib/configfiles/stretch.xml index 6dab29fc..ea88e2d0 100644 --- a/lib/configfiles/stretch.xml +++ b/lib/configfiles/stretch.xml @@ -1493,7 +1493,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 577e9d3b70374511f59d08bba3a9bbc6ef22aadd Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:40:55 +0200 Subject: [PATCH 2/8] Update buster.xml --- lib/configfiles/buster.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/buster.xml b/lib/configfiles/buster.xml index 0d3cea61..3555b7b4 100644 --- a/lib/configfiles/buster.xml +++ b/lib/configfiles/buster.xml @@ -1463,7 +1463,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 77a7037072d9bd334137b0eb86c3f8a8433ca6ba Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:41:24 +0200 Subject: [PATCH 3/8] Update jessie.xml --- lib/configfiles/jessie.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/jessie.xml b/lib/configfiles/jessie.xml index 98f22751..9339c6c8 100644 --- a/lib/configfiles/jessie.xml +++ b/lib/configfiles/jessie.xml @@ -1504,7 +1504,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 507a62f52df99d23c9f7a4a26d48dc615eb15ca1 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:41:54 +0200 Subject: [PATCH 4/8] Update trusty.xml --- lib/configfiles/trusty.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/trusty.xml b/lib/configfiles/trusty.xml index 9613a357..512cc921 100644 --- a/lib/configfiles/trusty.xml +++ b/lib/configfiles/trusty.xml @@ -502,7 +502,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 06694506767a41bf0751f6fbac1e1873fa9e3963 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:42:14 +0200 Subject: [PATCH 5/8] Update bionic.xml --- lib/configfiles/bionic.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/bionic.xml b/lib/configfiles/bionic.xml index 30fe1d6f..fac95592 100644 --- a/lib/configfiles/bionic.xml +++ b/lib/configfiles/bionic.xml @@ -1504,7 +1504,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From de7c438315b7b257a083b1c0267e9404a3d803de Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:42:31 +0200 Subject: [PATCH 6/8] Update gentoo.xml --- lib/configfiles/gentoo.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/gentoo.xml b/lib/configfiles/gentoo.xml index 87424ed7..e84a4439 100644 --- a/lib/configfiles/gentoo.xml +++ b/lib/configfiles/gentoo.xml @@ -1474,7 +1474,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 5698f8360e31dd9144c433f40654ad81179e7f53 Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:42:49 +0200 Subject: [PATCH 7/8] Update rhel_centos.xml --- lib/configfiles/rhel_centos.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/rhel_centos.xml b/lib/configfiles/rhel_centos.xml index 0e3682f9..a31b2dfa 100644 --- a/lib/configfiles/rhel_centos.xml +++ b/lib/configfiles/rhel_centos.xml @@ -95,7 +95,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]> From 7e9b373a58cac2eaec200c6a9307ec2a7664e7fe Mon Sep 17 00:00:00 2001 From: Dave Date: Fri, 19 Jul 2019 01:43:07 +0200 Subject: [PATCH 8/8] Update xenial.xml --- lib/configfiles/xenial.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/configfiles/xenial.xml b/lib/configfiles/xenial.xml index 8df99edf..62f7ccd5 100644 --- a/lib/configfiles/xenial.xml +++ b/lib/configfiles/xenial.xml @@ -1504,7 +1504,7 @@ user = password = dbname = hosts = -query = SELECT destination FROM mail_virtual WHERE email = '%s' AND trim(destination) <> '' +query = SELECT destination FROM mail_virtual AS v, panel_customers AS c WHERE c.customerid = v.customerid AND c.deactivated = 0 AND v.email = '%s' AND trim(v.destination) <> '' ]]>