From d8faa4e7e3fb74e554f6c9339f6fe4e2883c3bf1 Mon Sep 17 00:00:00 2001
From: Till Brehm <tbrehm@ispconfig.org>
Date: Fri, 18 Sep 2015 13:43:03 -0400
Subject: [PATCH] Fix by dirkd: Since file() doesn't remove "\n" from the lines read the condition $lines[$l] == '' never evaluated to true. So $mailHeaders would always contain every line from the template while $mailBody contained none of them.
---
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