check for subdomain usage

scambra · scambra · commit 92204eb233b1 · 2014-08-12T16:57:23.000+02:00
diff --git a/interface/web/client/domain_del.php b/interface/web/client/domain_del.php
@@ -80,7 +80,7 @@ function onBeforeDelete() {
 			$app->error($wb['error_domain_in mailuse']);
 		}
 
-		$sql = "SELECT domain_id FROM web_domain WHERE domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost')";
+		$sql = "SELECT domain_id FROM web_domain WHERE (domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost')) OR (domain = '%." . $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']);

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ function onBeforeDelete() {`
`80`	`80`	`$app->error($wb['error_domain_in mailuse']);`
`81`	`81`	`}`
`82`	`82`
`83`		`- $sql = "SELECT domain_id FROM web_domain WHERE domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost')";`
	`83`	`+ $sql = "SELECT domain_id FROM web_domain WHERE (domain = '" . $app->db->quote($domain) . "' AND type IN ('alias', 'vhost')) OR (domain = '%." . $app->db->quote($domain) . "' AND type IN ('subdomain', 'vhostsubdomain'))";`
`84`	`84`	`$res = $app->db->queryOneRecord($sql);`
`85`	`85`	`if (is_array($res)){`
`86`	`86`	`$app->error($wb['error_domain_in webuse']);`