Fixed: FS#810 - FTP - If username is left blank and client clicks options a...

tbrehm

2009-07-09 95188035dd5d37294781aa064f37fef278147524

Fixed: FS#810 - FTP - If username is left blank and client clicks options a clientname_ blank username is created.

 interface/web/sites/form/ftp_user.tform.php

@@ -83,12 +83,10 @@
        'username' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'NOTEMPTY',
                                                        'errmsg'=> 'username_error_empty'),
                                        1 => array (    'type'    => 'UNIQUE',
            'validators'    => array (     0 => array (    'type'    => 'UNIQUE',
                                                        'errmsg'=> 'username_error_unique'),
                                        2 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{1,64}$/',
                                        1 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{0,64}$/',
                                                        'errmsg'=> 'username_error_regex'),
                                    ),
            'default'    => '',

 interface/web/sites/form/shell_user.tform.php

@@ -83,12 +83,10 @@
        'username' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'TEXT',
            'validators'    => array (     0 => array (    'type'    => 'NOTEMPTY',
                                                        'errmsg'=> 'username_error_empty'),
                                        1 => array (    'type'    => 'UNIQUE',
            'validators'    => array (     0 => array (    'type'    => 'UNIQUE',
                                                        'errmsg'=> 'username_error_unique'),
                                        2 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{1,64}$/',
                                        1 => array (    'type'    => 'REGEX',
                                                        'regex' => '/^[\w\.\-]{0,64}$/',
                                                        'errmsg'=> 'username_error_regex'),
                                    ),
            'default'    => '',

 interface/web/sites/ftp_user_edit.php

@@ -108,6 +108,11 @@
        // Set a few fixed values
        $this->dataRecord["server_id"] = $parent_domain["server_id"];
        
        //die(print_r($this->dataRecord));
		
        if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
        if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
		
        parent::onSubmit();
    }
    

 interface/web/sites/lib/lang/en_ftp_user.lng

@@ -24,4 +24,5 @@
$wb["uid_error_empty"] = 'GID empty.';
$wb["directory_error_empty"] = 'Directory empty.';
$wb['directory_error_notinweb'] = 'Directory not inside of web root directory.';
$wb["parent_domain_id_error_empty"] = 'No website selected.';
?>

 interface/web/sites/lib/lang/en_shell_user.lng

@@ -19,4 +19,5 @@
$wb["uid_error_empty"] = 'GID empty.';
$wb["directory_error_empty"] = 'Directory empty.';
$wb["limit_shell_user_txt"] = 'The max number of shell users is reached.';
$wb["parent_domain_id_error_empty"] = 'No website selected.';
?>

 interface/web/sites/shell_user_edit.php

@@ -115,6 +115,9 @@
        // Set a few fixed values
        $this->dataRecord["server_id"] = $parent_domain["server_id"];
        
        if(isset($this->dataRecord['username']) && trim($this->dataRecord['username']) == '') $app->tform->errorMessage .= $app->tform->lng('username_error_empty').'<br />';
        if(isset($this->dataRecord['username']) && empty($this->dataRecord['parent_domain_id'])) $app->tform->errorMessage .= $app->tform->lng('parent_domain_id_error_empty').'<br />';
		
        parent::onSubmit();
    }
    
@@ -129,7 +132,7 @@
            }
        }
        unset($blacklist);

		
        /*
         * If the names should be restricted -> do it!
         */