From 4f1de1c95e0a6c0a9da8f9865b960386ca040d4f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 12 Nov 2012 11:29:10 -0500
Subject: [PATCH] - Make sure alias domain SEO redirects get written only if they don't collide with SEO redirects from parent web site.
---
interface/lib/classes/validate_domain.inc.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index 08f9b6f..e70f161 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -88,7 +88,7 @@
$app->uses('ini_parser,getconf');
$settings = $app->getconf->get_global_config('domains');
if ($settings['use_domain_module'] == 'y') {
- $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . intval($check_domain);
+ $sql = "SELECT domain_id, domain FROM domain WHERE domain_id = " . $app->functions->intval($check_domain);
$domain_check = $app->db->queryOneRecord($sql);
if(!$domain_check) return;
$check_domain = $domain_check['domain'];
@@ -108,11 +108,17 @@
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` != " . $app->functions->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` != " . $app->functions->intval($primary_id));
if($check['cnt'] > 0) return false;
}
--
Gitblit v1.9.1