From d76073cdd1d63965f040078b8f20d674ce642f69 Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Mon, 22 Jun 2015 22:02:36 +0200
Subject: [PATCH] Added default values

---
 servatrice/src/servatrice_database_interface.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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