From 0bc228446c1f680f14aff72dbfd85dc5edd0043e Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Fri, 12 Jul 2013 09:59:37 -0400
Subject: [PATCH] - Changed installer template handling   It is now possible to put a customized copy of each .master template file into   /usr/local/ispconfig/server/conf-custom/install/   to keep manual changes done in this file.   If existing, these .master files are used on ISPConfig upgrade instead of the provided installer templates.

---
 interface/lib/classes/validate_client.inc.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php
index 9b0546a..36370ab 100644
--- a/interface/lib/classes/validate_client.inc.php
+++ b/interface/lib/classes/validate_client.inc.php
@@ -81,7 +81,8 @@
 		  ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' || 
 		   $global_config['ftpuser_prefix'] == '' ||
 		   $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
-		   $global_config['shelluser_prefix'] == '' )) {
+		   $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";

--
Gitblit v1.9.1