Fixed: FS#2567 - Username in ISPConfig 3.05

tbrehm

2012-12-04 29510bfe9309288b41f77a530a730fecb7c4e2dd

Fixed: FS#2567 - Username in ISPConfig 3.05

 install/tpl/system.ini.master

@@ -22,6 +22,7 @@
dblist_phpmyadmin_link=y
phpmyadmin_url=/phpmyadmin
webftp_url=
client_username_web_check_disabled=n

[tools]


 interface/lib/classes/validate_client.inc.php

@@ -81,7 +81,8 @@
          ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' || 
           $global_config['ftpuser_prefix'] == '' ||
           $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
           $global_config['shelluser_prefix'] == '' )) {
           $global_config['shelluser_prefix'] == '' ) &&
           $global_config['client_username_web_check_disabled'] == 'n') {
            $errmsg = $validator['errmsg'];
            if(isset($app->tform->wordbook[$errmsg])) {
                return $app->tform->wordbook[$errmsg]."<br>\r\n";

 interface/web/admin/form/system_config.tform.php

@@ -154,6 +154,12 @@
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
        'client_username_web_check_disabled' => array (
            'datatype'    => 'VARCHAR',
            'formtype'    => 'CHECKBOX',
            'default'    => 'n',
            'value'        => array(0 => 'n',1 => 'y')
        ),
    ##################################
    # ENDE Datatable fields
    ##################################

 interface/web/admin/form/users.tform.php

@@ -146,6 +146,10 @@
                                                    2 => array (    'type'    => 'REGEX',
                                                                    'regex' => '/^[\w\.\-\_]{0,64}$/',
                                                                    'errmsg'=> 'username_err'),
                                                    3 => array (    'type'    => 'CUSTOM',
                                                        'class' => 'validate_client',
                                                        'function' => 'username_collision',
                                                        'errmsg'=> 'username_error_collision'),
                                                ),
            'regex'        => '',
            'errmsg'    => '',

 interface/web/admin/lib/lang/en_system_config.lng

@@ -45,4 +45,5 @@
$wb['use_combobox_txt'] = 'Use jQuery UI Combobox';
$wb['use_loadindicator_txt'] = 'Use Load Indicator';
$wb['f5_to_reload_js_txt'] = 'If you change this, you might have to press F5 to make the browser reload JavaScript libraries or empty your browser cache.';
$wb['client_username_web_check_disabled_txt'] = 'Disable client username check for the word \'web\'.';
?>

 interface/web/admin/lib/lang/en_users.lng

@@ -29,4 +29,5 @@
$wb['repeat_password_txt'] = 'Repeat Password';
$wb['password_mismatch_txt'] = 'The passwords do not match.';
$wb['password_match_txt'] = 'The passwords do match.';
$wb['username_error_collision'] = 'The username may not be web or web plus a number."';
?>

 interface/web/admin/templates/system_config_sites_edit.htm

@@ -45,6 +45,12 @@
                    {tmpl_var name='vhost_subdomains'}&nbsp;{tmpl_var name='vhost_subdomains_note_txt'}
                </div>
            </div>
            <div class="ctrlHolder">
                <p class="label">{tmpl_var name='client_username_web_check_disabled_txt'}</p>
                <div class="multiField">
                    {tmpl_var name='client_username_web_check_disabled'}
                </div>
            </div>
        </fieldset>
            
        <input type="hidden" name="id" value="{tmpl_var name='id'}">