From afe87b044dc20ceb104b31213543c14b562facd7 Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.com>
Date: Sat, 25 Apr 2015 08:26:02 -0400
Subject: [PATCH] Merge branch 'reject_sender_login_mismatch' into mdbox-format

---
 interface/web/client/domain_del.php |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/interface/web/client/domain_del.php b/interface/web/client/domain_del.php
index 6bc07e6..701b449 100644
--- a/interface/web/client/domain_del.php
+++ b/interface/web/client/domain_del.php
@@ -62,26 +62,26 @@
 		 */
 		$domain = $this->dataRecord['domain'];
 
-		$sql = "SELECT id FROM dns_soa WHERE origin = '" . $app->db->quote($domain.".") . "'";
-		$res = $app->db->queryOneRecord($sql);
+		$sql = "SELECT id FROM dns_soa WHERE origin = ?";
+		$res = $app->db->queryOneRecord($sql, $domain.".");
 		if (is_array($res)){
 			$app->error($wb['error_domain_in dnsuse']);
 		}
 
-		$sql = "SELECT id FROM dns_slave WHERE origin = '" . $app->db->quote($domain.".") . "'";
-		$res = $app->db->queryOneRecord($sql);
+		$sql = "SELECT id FROM dns_slave WHERE origin = ?";
+		$res = $app->db->queryOneRecord($sql, $domain.".");
 		if (is_array($res)){
 			$app->error($wb['error_domain_in dnsslaveuse']);
 		}
 
-		$sql = "SELECT domain_id FROM mail_domain WHERE domain = '" . $app->db->quote($domain) . "'";
-		$res = $app->db->queryOneRecord($sql);
+		$sql = "SELECT domain_id FROM mail_domain WHERE domain = ?";
+		$res = $app->db->queryOneRecord($sql, $domain);
 		if (is_array($res)){
 			$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', 'vhostalias')) OR (domain LIKE '%." . $app->db->quote($domain) . "' AND type IN ('subdomain', 'vhostsubdomain'))";
-		$res = $app->db->queryOneRecord($sql);
+		$sql = "SELECT domain_id FROM web_domain WHERE (domain = ? AND type IN ('alias', 'vhost', 'vhostalias')) OR (domain LIKE ? AND type IN ('subdomain', 'vhostsubdomain'))";
+		$res = $app->db->queryOneRecord($sql, $domain, '%.' . $domain);
 		if (is_array($res)){
 			$app->error($wb['error_domain_in webuse']);
 		}

--
Gitblit v1.9.1