From 0cd87e682012f224e2b74531190bb983fdcbb430 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Sun, 10 Jan 2016 03:31:27 -0500
Subject: [PATCH] Revert "allow 0 for ISINT"

---
 interface/web/sites/form/ftp_user.tform.php |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index 2b97832..239bfdb 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -166,6 +166,13 @@
 				'formtype'  => 'TEXT',
 				'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
 						'errmsg'=> 'uid_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysuser',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default'   => '0',
 				'value'     => '',
@@ -177,6 +184,13 @@
 				'formtype'  => 'TEXT',
 				'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
 						'errmsg'=> 'gid_error_empty'),
+						1 => array(
+							'type' => 'CUSTOM',
+							'class' => 'validate_systemuser',
+							'function' => 'check_sysgroup',
+							'check_names' => true,
+							'errmsg' => 'invalid_system_user_or_group_txt'
+						),
 				),
 				'default'   => '0',
 				'value'     => '',
@@ -187,7 +201,14 @@
 				'datatype'  => 'VARCHAR',
 				'formtype'  => 'TEXT',
 				'validators'    => array (  0 => array (    'type'  => 'NOTEMPTY',
-						'errmsg'=> 'directory_error_empty'),
+															'errmsg'=> 'directory_error_empty'),
+											1 => array ( 	'type' => 'REGEX',
+															'regex' => '/^\/[a-zA-Z0-9\ \.\-\_\/]{10,128}$/',
+															'errmsg'=> 'directory_error_regex'),
+											2 => array (    'type'  => 'CUSTOM',
+														'class' => 'validate_ftpuser',
+														'function' => 'ftp_dir',
+														'errmsg' => 'directory_error_notinweb'),
 				),
 				'default'   => '',
 				'value'     => '',
@@ -273,6 +294,10 @@
 
 }
 
+$form['tabs']['advanced']['fields']['expires'] = array(
+	'datatype' => 'DATETIME',
+	'formtype' => 'DATETIME'
+);
 
 
 ?>

--
Gitblit v1.9.1