From e5685e737cb80ef9a5c3948ce9a96f58eb99413d Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 21 Oct 2013 12:19:42 -0400
Subject: [PATCH] Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
---
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