From baa7f2736bc91ca3feaed685e8a67a46db4fbb98 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Mon, 17 Feb 2014 05:02:38 -0500
Subject: [PATCH] Fixed vhostsubdomain not empty regex check to allow 1 char subdomains.
---
interface/lib/classes/validate_client.inc.php | 71 ++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 35 deletions(-)
diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php
index 9b0546a..c6f2dcb 100644
--- a/interface/lib/classes/validate_client.inc.php
+++ b/interface/lib/classes/validate_client.inc.php
@@ -29,59 +29,60 @@
*/
class validate_client {
-
+
/*
Validator function to check if a username is unique.
*/
function username_unique($field_name, $field_value, $validator) {
global $app;
-
+
if(isset($app->remoting_lib->primary_id)) {
$client_id = $app->remoting_lib->primary_id;
} else {
$client_id = $app->tform->primary_id;
}
-
+
if($client_id == 0) {
- $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."'");
- if($num_rec["number"] > 0) {
- $errmsg = $validator['errmsg'];
- if(isset($app->tform->wordbook[$errmsg])) {
- return $app->tform->wordbook[$errmsg]."<br>\r\n";
- } else {
- return $errmsg."<br>\r\n";
- }
- }
- } else {
- $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$client_id);
+ $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."'");
if($num_rec["number"] > 0) {
- $errmsg = $validator['errmsg'];
- if(isset($app->tform->wordbook[$errmsg])) {
- return $app->tform->wordbook[$errmsg]."<br>\r\n";
+ $errmsg = $validator['errmsg'];
+ if(isset($app->tform->wordbook[$errmsg])) {
+ return $app->tform->wordbook[$errmsg]."<br>\r\n";
+ } else {
+ return $errmsg."<br>\r\n";
+ }
+ }
+ } else {
+ $num_rec = $app->db->queryOneRecord("SELECT count(*) as number FROM sys_user WHERE username = '".$app->db->quote($field_value)."' AND client_id != ".$app->functions->intval($client_id));
+ if($num_rec["number"] > 0) {
+ $errmsg = $validator['errmsg'];
+ if(isset($app->tform->wordbook[$errmsg])) {
+ return $app->tform->wordbook[$errmsg]."<br>\r\n";
} else {
return $errmsg."<br>\r\n";
}
}
}
}
-
+
function username_collision($field_name, $field_value, $validator) {
global $app;
-
+
if(isset($app->remoting_lib->primary_id)) {
$client_id = $app->remoting_lib->primary_id;
} else {
$client_id = $app->tform->primary_id;
}
-
+
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
-
- if((trim($field_value) == 'web' || preg_match('/^web[0-9]/',$field_value)) &&
- ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' ||
- $global_config['ftpuser_prefix'] == '' ||
- $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
- $global_config['shelluser_prefix'] == '' )) {
+
+ if((trim($field_value) == 'web' || preg_match('/^web[0-9]/', $field_value)) &&
+ ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' ||
+ $global_config['ftpuser_prefix'] == '' ||
+ $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
+ $global_config['shelluser_prefix'] == '' ) &&
+ $global_config['client_username_web_check_disabled'] == 'n') {
$errmsg = $validator['errmsg'];
if(isset($app->tform->wordbook[$errmsg])) {
return $app->tform->wordbook[$errmsg]."<br>\r\n";
@@ -89,13 +90,13 @@
return $errmsg."<br>\r\n";
}
}
-
-
-
-
+
+
+
+
}
-
-
-
-
-}
\ No newline at end of file
+
+
+
+
+}
--
Gitblit v1.9.1