From 6361e431065471dd7bf3b1a4745ca398a940b953 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 16 Apr 2012 08:36:59 -0400
Subject: [PATCH] Improved: FS#2176 - collision between shell/ftp accounts and client accounts named webXX is not checked
---
interface/lib/classes/validate_client.inc.php | 2 +-
interface/web/client/lib/lang/en_reseller.lng | 2 +-
interface/web/client/lib/lang/en_client.lng | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php
index fa0f102..9b0546a 100644
--- a/interface/lib/classes/validate_client.inc.php
+++ b/interface/lib/classes/validate_client.inc.php
@@ -77,7 +77,7 @@
$app->uses('getconf');
$global_config = $app->getconf->get_global_config('sites');
- if(substr($field_value,0,3) == 'web' &&
+ 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]' ||
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index f2edf1f..ba7bf11 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -109,5 +109,5 @@
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.';
$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb["username_error_collision"] = 'The username may not start with the word - web -';
+$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number';
?>
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index 9f1e36c..c1e9375 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -108,5 +108,5 @@
$wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.';
$wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.';
$wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.';
-$wb["username_error_collision"] = 'The username may not start with the word - web -';
+$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number';
?>
--
Gitblit v1.9.1