applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-25 08:28:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[users] Improve error messages

Browse source 
- distinguish beginning of username from the rest
 - must start with a letter or _
 - tighten message for bad username and bad hostname

FIXES #1261
This commit is contained in:
Adriaan de Groot 2019-11-01 13:05:58 +01:00
parent 8232ca626c
commit 93eb169ea5
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/users/UsersPage.cpp
View file

@ -305,7 +305,8 @@ void
UsersPage::validateUsernameText( const QString& textRef ) UsersPage::validateUsernameText( const QString& textRef )
{ {
QString text( textRef ); QString text( textRef );
QRegExpValidator val( USERNAME_RX ); QRegExpValidator val_whole( USERNAME_RX );
QRegExpValidator val_start( QRegExp( "[a-z_].*" ) ); // anchors are implicit in QRegExpValidator
int pos = -1; int pos = -1;
if ( text.isEmpty() ) if ( text.isEmpty() )
@ -319,12 +320,20 @@ UsersPage::validateUsernameText( const QString& textRef )
labelError( ui->labelUsername, ui->labelUsernameError, tr( "Your username is too long." ) ); labelError( ui->labelUsername, ui->labelUsernameError, tr( "Your username is too long." ) );
m_readyUsername = false; m_readyUsername = false;
} }
else if ( val.validate( text, pos ) == QValidator::Invalid ) else if ( val_start.validate( text, pos ) == QValidator::Invalid )
{ {
labelError( labelError(
ui->labelUsername, ui->labelUsername,
ui->labelUsernameError, ui->labelUsernameError,
tr( "Your username contains invalid characters. Only lowercase letters and numbers are allowed." ) ); tr( "Your username must start with a lowercase letter or underscore." ) );
m_readyUsername = false;
}
else if ( val_whole.validate( text, pos ) == QValidator::Invalid )
{
labelError(
ui->labelUsername,
ui->labelUsernameError,
tr( "Only lowercase letters, numbers, underscore and hyphen are allowed." ) );
m_readyUsername = false; m_readyUsername = false;
} }
else else
@ -372,7 +381,7 @@ UsersPage::validateHostnameText( const QString& textRef )
{ {
labelError( ui->labelHostname, labelError( ui->labelHostname,
ui->labelHostnameError, ui->labelHostnameError,
tr( "Your hostname contains invalid characters. Only letters, numbers and dashes are allowed." ) ); tr( "Only letters, numbers, underscore and hyphen are allowed." ) );
m_readyHostname = false; m_readyHostname = false;
} }
else else