From b31c9d7bb641db612beb3bad4fc59d7c7489f1ae Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 25 Aug 2014 11:16:50 -0400
Subject: [PATCH] Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
---
interface/web/sites/form/shell_user.tform.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/interface/web/sites/form/shell_user.tform.php b/interface/web/sites/form/shell_user.tform.php
index 8ad8159..4268fc0 100644
--- a/interface/web/sites/form/shell_user.tform.php
+++ b/interface/web/sites/form/shell_user.tform.php
@@ -97,7 +97,7 @@
'type' => 'CUSTOM',
'class' => 'validate_systemuser',
'function' => 'check_sysuser',
- 'check_names' => true,
+ 'check_names' => false,
'errmsg' => 'invalid_username_txt'
),
),
@@ -237,6 +237,10 @@
1 => array ( 'type' => 'REGEX',
'regex' => '/^\/[a-zA-Z0-9\ \.\-\_\/]{10,128}$/',
'errmsg'=> 'directory_error_regex'),
+ 2 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_systemuser',
+ 'function' => 'shelluser_dir',
+ 'errmsg' => 'directory_error_notinweb'),
),
'default' => '',
'value' => '',
--
Gitblit v1.9.1