diff --git a/interface/lib/classes/validate_ftpuser.inc.php b/interface/lib/classes/validate_ftpuser.inc.php index 64ca12f2279e37d358772889a33bb9e54b09b02e..8e0663ecae9dc661df5051163a37a9b9d73a1bea 100644 --- a/interface/lib/classes/validate_ftpuser.inc.php +++ b/interface/lib/classes/validate_ftpuser.inc.php @@ -36,7 +36,10 @@ class validate_ftpuser { function ftp_dir($field_name, $field_value, $validator) { global $app; - if($app->tform->primary_id == 0) { + $primary_id = (isset($app->tform->primary_id) && $app->tform->primary_id > 0)?$app->tform->primary_id:$app->remoting_lib->primary_id; + $primary_id = $app->functions->intval($primary_id); + + if($primary_id == 0 && !isset($app->remoting_lib->dataRecord['parent_domain_id'])) { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { return $app->tform->wordbook[$errmsg]."
\r\n"; @@ -45,18 +48,25 @@ class validate_ftpuser { } } - - $ftp_data = $app->db->queryOneRecord("SELECT parent_domain_id FROM ftp_user WHERE ftp_user_id = '".$app->db->quote($app->tform->primary_id)."'"); - if(!is_array($ftp_data) || $ftp_data["parent_domain_id"] < 1) { - $errmsg = $validator['errmsg']; - if(isset($app->tform->wordbook[$errmsg])) { - return $app->tform->wordbook[$errmsg]."
\r\n"; + if($primary_id > 0) { + //* get parent_domain_id from website + $ftp_data = $app->db->queryOneRecord("SELECT parent_domain_id FROM ftp_user WHERE ftp_user_id = '".$app->db->quote($primary_id)."'"); + if(!is_array($ftp_data) || $ftp_data["parent_domain_id"] < 1) { + $errmsg = $validator['errmsg']; + if(isset($app->tform->wordbook[$errmsg])) { + return $app->tform->wordbook[$errmsg]."
\r\n"; + } else { + return $errmsg."
\r\n"; + } } else { - return $errmsg."
\r\n"; + $parent_domain_id = $ftp_data["parent_domain_id"]; } + } else { + //* get parent_domain_id from dataRecord when we have a insert operation trough remote API + $parent_domain_id = $app->functions->intval($app->remoting_lib->dataRecord['parent_domain_id']); } - $domain_data = $app->db->queryOneRecord("SELECT domain_id, document_root FROM web_domain WHERE domain_id = '".$app->db->quote($ftp_data["parent_domain_id"])."'"); + $domain_data = $app->db->queryOneRecord("SELECT domain_id, document_root FROM web_domain WHERE domain_id = '".$app->db->quote($parent_domain_id)."'"); if(!is_array($domain_data) || $domain_data["domain_id"] < 1) { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { diff --git a/interface/lib/classes/validate_systemuser.inc.php b/interface/lib/classes/validate_systemuser.inc.php index 6df3a4589c6305a58e1357ac7c406c7a0241f581..2cab1cf44464c563b7296230cd3af6682d906aa3 100644 --- a/interface/lib/classes/validate_systemuser.inc.php +++ b/interface/lib/classes/validate_systemuser.inc.php @@ -29,6 +29,16 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ class validate_systemuser { + + function get_error($errmsg) { + global $app; + + if(isset($app->tform->wordbook[$errmsg])) { + return $app->tform->wordbook[$errmsg]."
\r\n"; + } else { + return $errmsg."
\r\n"; + } + } /* Validator function to check if a given user is ok. @@ -36,11 +46,15 @@ class validate_systemuser { function check_sysuser($field_name, $field_value, $validator) { global $app; + //* Skip Test if we have the placeholder input of the remote APi for the web_domain system_user field here. + if($field_name == 'system_user' && $field_value == '-') return ''; + + //* Check the input $errmsg = $validator['errmsg']; $check_names = (isset($validator['check_names']) && $validator['check_names'] == true)?true:false; if($app->functions->is_allowed_user(trim(strtolower($field_value)),$check_names) == false) { - return $app->tform->wordbook[$errmsg]."
\r\n"; + return $this->get_error($errmsg); } } @@ -50,11 +64,14 @@ class validate_systemuser { function check_sysgroup($field_name, $field_value, $validator) { global $app; + //* Skip Test if we have the placeholder input of the remote APi for the web_domain system_group field here. + if($field_name == 'system_group' && $field_value == '-') return ''; + $errmsg = $validator['errmsg']; $check_names = (isset($validator['check_names']) && $validator['check_names'] == true)?true:false; if($app->functions->is_allowed_group(trim(strtolower($field_value)),$check_names) == false) { - return $app->tform->wordbook[$errmsg]."
\r\n"; + return $this->get_error($errmsg); } } @@ -63,8 +80,11 @@ class validate_systemuser { */ function shelluser_dir($field_name, $field_value, $validator) { global $app; - - if($app->tform->primary_id == 0) { + + $primary_id = (isset($app->tform->primary_id) && $app->tform->primary_id > 0)?$app->tform->primary_id:$app->remoting_lib->primary_id; + $primary_id = $app->functions->intval($primary_id); + + if($primary_id == 0 && !isset($app->remoting_lib->dataRecord['parent_domain_id'])) { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { return $app->tform->wordbook[$errmsg]."
\r\n"; @@ -73,18 +93,25 @@ class validate_systemuser { } } - - $shell_data = $app->db->queryOneRecord("SELECT parent_domain_id FROM shell_user WHERE shell_user_id = '".$app->db->quote($app->tform->primary_id)."'"); - if(!is_array($shell_data) || $shell_data["parent_domain_id"] < 1) { - $errmsg = $validator['errmsg']; - if(isset($app->tform->wordbook[$errmsg])) { - return $app->tform->wordbook[$errmsg]."
\r\n"; + if($primary_id > 0) { + //* get parent_domain_id from website + $shell_data = $app->db->queryOneRecord("SELECT parent_domain_id FROM shell_user WHERE shell_user_id = '".$app->db->quote($primary_id)."'"); + if(!is_array($shell_data) || $shell_data["parent_domain_id"] < 1) { + $errmsg = $validator['errmsg']; + if(isset($app->tform->wordbook[$errmsg])) { + return $app->tform->wordbook[$errmsg]."
\r\n"; + } else { + return $errmsg."
\r\n"; + } } else { - return $errmsg."
\r\n"; + $parent_domain_id = $shell_data["parent_domain_id"]; } + } else { + //* get parent_domain_id from dataRecord when we have a insert operation trough remote API + $parent_domain_id = $app->functions->intval($app->remoting_lib->dataRecord['parent_domain_id']); } - $domain_data = $app->db->queryOneRecord("SELECT domain_id, document_root FROM web_domain WHERE domain_id = '".$app->db->quote($shell_data["parent_domain_id"])."'"); + $domain_data = $app->db->queryOneRecord("SELECT domain_id, document_root FROM web_domain WHERE domain_id = '".$app->db->quote($parent_domain_id)."'"); if(!is_array($domain_data) || $domain_data["domain_id"] < 1) { $errmsg = $validator['errmsg']; if(isset($app->tform->wordbook[$errmsg])) { @@ -116,5 +143,4 @@ class validate_systemuser { } } - } diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php index ef11b6058aaf7f282841d53cb0cb99d219a51668..e96e63d16b60078872fdc0a6ec285dc4624391c9 100644 --- a/interface/web/sites/form/ftp_user.tform.php +++ b/interface/web/sites/form/ftp_user.tform.php @@ -205,6 +205,10 @@ if($app->auth->is_admin()) { 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' => '', diff --git a/interface/web/sites/form/web_vhost_subdomain.tform.php b/interface/web/sites/form/web_vhost_subdomain.tform.php index e4ca6a2fd0991a238b8ee3a61f44ccbc8d9bf3be..3aa2276fc56f44b84e029dede93ccc3cee63ee83 100644 --- a/interface/web/sites/form/web_vhost_subdomain.tform.php +++ b/interface/web/sites/form/web_vhost_subdomain.tform.php @@ -486,7 +486,7 @@ $form["tabs"]['stats'] = array ( 'datatype' => 'VARCHAR', 'formtype' => 'SELECT', 'default' => 'webalizer', - 'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats') + 'value' => array('webalizer' => 'Webalizer', 'awstats' => 'AWStats', '' => 'None') ), //################################# // ENDE Datatable fields diff --git a/remoting_client/examples/sites_ftp_user_add.php b/remoting_client/examples/sites_ftp_user_add.php index b8d499b2ff5c5eb99fc8ee5739847e1a1cdbc889..6e48d80baba3d8f3546b04a0048d76dbf5983bef 100644 --- a/remoting_client/examples/sites_ftp_user_add.php +++ b/remoting_client/examples/sites_ftp_user_add.php @@ -20,13 +20,13 @@ try { $params = array( 'server_id' => 1, 'parent_domain_id' => 1, - 'username' => 'threep', - 'password' => 'wood', + 'username' => 'tom', + 'password' => 'secret', 'quota_size' => 10000, 'active' => 'y', 'uid' => '5000', 'gid' => '5000', - 'dir' => 'maybe', + 'dir' => '/var/www/clients/client0/web1', 'quota_files' => -1, 'ul_ratio' => -1, 'dl_ratio' => -1, diff --git a/remoting_client/examples/sites_ftp_user_update.php b/remoting_client/examples/sites_ftp_user_update.php index d09b4167019771cec631c52deb377f3b3b52f429..1f3695357522cd910099c9628ae00f6ca1823e30 100644 --- a/remoting_client/examples/sites_ftp_user_update.php +++ b/remoting_client/examples/sites_ftp_user_update.php @@ -15,7 +15,7 @@ try { } //* Parameters - $client_id = 1; + $client_id = 0; $ftp_user_id = 1; diff --git a/remoting_client/examples/sites_shell_user_add.php b/remoting_client/examples/sites_shell_user_add.php index 84d4012f0efcaad7a54126eb7dc4553ca71e1a46..c3f875bf016a4c2765ac037b1b2f8cb475b261cc 100644 --- a/remoting_client/examples/sites_shell_user_add.php +++ b/remoting_client/examples/sites_shell_user_add.php @@ -20,14 +20,14 @@ try { $params = array( 'server_id' => 1, 'parent_domain_id' => 1, - 'username' => 'threep2', - 'password' => 'wood', + 'username' => 'tom', + 'password' => 'test', 'quota_size' => 10000, 'active' => 'y', - 'puser' => 'null', - 'pgroup' => 'null', + 'puser' => 'web1', + 'pgroup' => 'client0', 'shell' => '/bin/bash', - 'dir' => 'maybe', + 'dir' => '/var/www/clients/client0/web1', 'chroot' => '' ); diff --git a/remoting_client/examples/sites_shell_user_update.php b/remoting_client/examples/sites_shell_user_update.php index 73b90138f6fdc932a08e704a7de37fa9096de228..a60262d20acfaa6c222be4e06b7a5d0683c17d0e 100644 --- a/remoting_client/examples/sites_shell_user_update.php +++ b/remoting_client/examples/sites_shell_user_update.php @@ -15,7 +15,7 @@ try { } //* Parameters - $client_id = 3; + $client_id = 0; $shell_user_id = 1;