From f6528883010fef654e2bdd870dd5ce020a76dfe8 Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Thu, 13 Sep 2012 04:38:38 -0400
Subject: [PATCH] Fixed/Implemented: Added unique check on auto-subdomains, too. If you change an auto subdomain of an alias/web-domain there has to be checked if a subdomain with www. or *. has been created already.
---
interface/lib/classes/validate_domain.inc.php | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/validate_domain.inc.php b/interface/lib/classes/validate_domain.inc.php
index 25f16af..08f9b6f 100644
--- a/interface/lib/classes/validate_domain.inc.php
+++ b/interface/lib/classes/validate_domain.inc.php
@@ -79,6 +79,25 @@
if(!$result) return $this->get_error('domain_error_unique');
}
+ /* Validator function for checking the auto subdomain of a web/aliasdomain */
+ function web_domain_autosub($field_name, $field_value, $validator) {
+ global $app;
+ if(empty($field_value) || $field_name != 'subdomain') return; // none set
+
+ $check_domain = $_POST['domain'];
+ $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);
+ $domain_check = $app->db->queryOneRecord($sql);
+ if(!$domain_check) return;
+ $check_domain = $domain_check['domain'];
+ }
+
+ $result = $this->_check_unique($field_value . '.' . $check_domain, true);
+ if(!$result) return $this->get_error('domain_error_autosub');
+ }
+
/* internal validator function to match regexp */
function _regex_validate($domain_name, $allow_wildcard = false) {
$pattern = '/^' . ($allow_wildcard == true ? '(\*\.)?' : '') . '[\w\.\-]{2,255}\.[a-zA-Z0-9\-]{2,30}$/';
@@ -86,14 +105,16 @@
}
/* check if the domain hostname is unique (keep in mind the auto subdomains!) */
- function _check_unique($domain_name) {
+ 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($check['cnt'] > 0) return 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));
- 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));
+ if($check['cnt'] > 0) return false;
+ }
return true;
}
--
Gitblit v1.9.1