From 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 14 Jun 2016 04:18:29 -0400
Subject: [PATCH] Merge branch 'florian030/ispconfig3-master' into stable-3.1

---
 interface/web/sites/form/shell_user.tform.php |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/interface/web/sites/form/shell_user.tform.php b/interface/web/sites/form/shell_user.tform.php
index db4efe3..4268fc0 100644
--- a/interface/web/sites/form/shell_user.tform.php
+++ b/interface/web/sites/form/shell_user.tform.php
@@ -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