aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added default values

Browse source
This commit is contained in:
Matt Lowe 2015-06-22 22:02:36 +02:00
parent a795d7d884
commit d76073cdd1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
servatrice/src/servatrice_database_interface.cpp
View file

@ -120,22 +120,22 @@ bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query)
bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user) bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user)
{ {
int maxNameLength = settingsCache->value("users/maxnamelength").toInt(); int maxNameLength = settingsCache->value("users/maxnamelength", 12).toInt();
int minNameLength = settingsCache->value("users/minnamelength").toInt(); int minNameLength = settingsCache->value("users/minnamelength", 6).toInt();
if (user.length() < minNameLength || user.length() > maxNameLength) if (user.length() < minNameLength || user.length() > maxNameLength)
return false; return false;
bool allowPunctuationPrefix = settingsCache->value("users/allowpunctuationprefix").toBool(); bool allowPunctuationPrefix = settingsCache->value("users/allowpunctuationprefix", false).toBool();
QString allowedPunctuation = settingsCache->value("users/allowedpunctuation").toString(); QString allowedPunctuation = settingsCache->value("users/allowedpunctuation", "_").toString();
if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0))) if (!allowPunctuationPrefix && allowedPunctuation.contains(user.at(0)))
return false; return false;
QString regEx("["); QString regEx("[");
if (settingsCache->value("users/allowlowercase").toBool()) if (settingsCache->value("users/allowlowercase", true).toBool())
regEx.append("a-z"); regEx.append("a-z");
if (settingsCache->value("users/allowuppercase").toBool()) if (settingsCache->value("users/allowuppercase", true).toBool())
regEx.append("A-Z"); regEx.append("A-Z");
if(settingsCache->value("users/allownumerics").toBool()) if(settingsCache->value("users/allownumerics", true).toBool())
regEx.append("0-9"); regEx.append("0-9");
regEx.append(allowedPunctuation); regEx.append(allowedPunctuation);
regEx.append("]+"); regEx.append("]+");