Feature #306 - Replacing hard-coded values for username length in validation rules in some forms. Including "." (dot) and "_" (underscore) in the specification for usernames as valid characters.

main/admin/user_add.php

@@ -114,10 +114,10 @@ $form->addElement('file', 'picture', get_lang('AddPicture'));
 $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
 $form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
 // Username
-$form->addElement('text', 'username', get_lang('LoginName'),array('maxlength'=>20));
+$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
 $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
 $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('username', '', 'maxlength',20);
 $form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']);
 // Password
 $group = array();

main/admin/user_edit.php

@@ -155,10 +155,10 @@ if (strlen($user_data['picture_uri']) > 0 )
 }
 
 // Username
-$form->addElement('text', 'username', get_lang('LoginName'),array('maxlength'=>20));
+$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
 $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
 $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('username', '', 'maxlength',20);
 $form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']);
 
 // Password

main/auth/inscription.php

@@ -111,12 +111,12 @@ if ($display_all_form===true) {
 	}
 	*/
 	//	USERNAME
-	$form->addElement('text', 'username', get_lang('UserName'), array('size' => 20));
+	$form->addElement('text', 'username', get_lang('UserName'), array('size' => USERNAME_MAX_LENGTH));
 	$form->applyFilter('username','trim');
 	$form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
+	$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
 	$form->addRule('username', get_lang('UsernameWrong'), 'username');
 	$form->addRule('username', get_lang('UserTaken'), 'username_available');
-	$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'),'20'), 'maxlength',20);
 	//	PASSWORD
 	$form->addElement('password', 'pass1', get_lang('Pass'),         array('size' => 40));
 	$form->addElement('password', 'pass2', get_lang('Confirmation'), array('size' => 40));

main/inc/lib/main_api.lib.php

@@ -185,10 +185,10 @@ define('LOG_CONFIGURATION_SETTINGS_CATEGORY', 'settings_category');
 define('LOG_CONFIGURATION_SETTINGS_VARIABLE', 'settings_variable');
 
 // Specification for usernames:
-// 1. ASCII-letters and digits only are acceptable, 20 characters length.
+// 1. ASCII-letters, digits, "." (dot), "_" (underscore) are acceptable, 20 characters maximal length.
 // 2. Empty username is formally valid, but it is reserved for the anonymous user.
 define('USERNAME_MAX_LENGTH', 20);
-define('USERNAME_PURIFIER', '/[^0-9A-Za-z]/');
+define('USERNAME_PURIFIER', '/[^0-9A-Za-z_\.]/');
 define('USERNAME_PURIFIER_SHALLOW', '/\s/');
 
 // Constants for detection some important PHP5 subversions.

main/mySpace/user_add.php

@@ -126,10 +126,10 @@ $form->addElement('file', 'picture', get_lang('AddPicture'));
 $allowed_picture_types = array ('jpg', 'jpeg', 'png', 'gif');
 $form->addRule('picture', get_lang('OnlyImagesAllowed').' ('.implode(',', $allowed_picture_types).')', 'filetype', $allowed_picture_types);
 // Username
-$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => 20));
+$form->addElement('text', 'username', get_lang('LoginName'), array('maxlength' => USERNAME_MAX_LENGTH));
 $form->addRule('username', get_lang('ThisFieldIsRequired'), 'required');
+$form->addRule('username', sprintf(get_lang('UsernameMaxXCharacters'), (string)USERNAME_MAX_LENGTH), 'maxlength', USERNAME_MAX_LENGTH);
 $form->addRule('username', get_lang('OnlyLettersAndNumbersAllowed'), 'username');
-$form->addRule('username', '', 'maxlength', 20);
 $form->addRule('username', get_lang('UserTaken'), 'username_available', $user_data['username']);
 // Password
 $group = array();