From 8090082406f9886be8071306d4df84541da4a556 Mon Sep 17 00:00:00 2001 From: mcramer Date: Thu, 13 Sep 2012 11:37:21 +0000 Subject: [PATCH] Fixed: new domain validation did not work on remoting api (update functions) --- interface/lib/classes/validate_domain.inc.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php index 08f9b6f2a..729e0cf36 100644 --- a/interface/lib/classes/validate_domain.inc.php +++ b/interface/lib/classes/validate_domain.inc.php @@ -108,11 +108,17 @@ class validate_domain { function _check_unique($domain_name, $only_domain = false) { global $app; - $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `domain` = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . intval($app->tform->primary_id)); + if(isset($app->remoting_lib->primary_id)) { + $primary_id = $app->remoting_lib->primary_id; + } else { + $primary_id = $app->tform->primary_id; + } + + $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE `domain` = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . intval($primary_id)); if($check['cnt'] > 0) return false; if($only_domain == false) { - $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . intval($app->tform->primary_id)); + $check = $app->db->queryOneRecord("SELECT COUNT(*) as `cnt` FROM `web_domain` WHERE CONCAT(`subdomain`, '.', `domain`) = '" . $app->db->quote($domain_name) . "' AND `domain_id` != " . intval($primary_id)); if($check['cnt'] > 0) return false; } -- GitLab