From 8abd175abb8a5abfd25bc9172554bc05c8ce40c3 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Wed, 13 Aug 2014 07:06:55 -0400 Subject: [PATCH] Merge branch 'domain_module_fixes' into 'master' --- interface/web/client/domain_del.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/interface/web/client/domain_del.php b/interface/web/client/domain_del.php index 9a02ac9..6bc07e6 100644 --- a/interface/web/client/domain_del.php +++ b/interface/web/client/domain_del.php @@ -80,7 +80,7 @@ $app->error($wb['error_domain_in mailuse']); } - $sql = "SELECT domain_id FROM web_domain WHERE domain = '" . $app->db->quote($domain) . "'"; + $sql = "SELECT domain_id FROM web_domain WHERE (domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost', 'vhostalias')) OR (domain LIKE '%." . $app->db->quote($domain) . "' AND type IN ('subdomain', 'vhostsubdomain'))"; $res = $app->db->queryOneRecord($sql); if (is_array($res)){ $app->error($wb['error_domain_in webuse']); -- Gitblit v1.9.1