jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-10 16:24:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'master' into mod_notify_onbanwarn

Browse source
This commit is contained in:
woogerboy21 2015-12-30 12:58:29 -05:00
commit 3ed3919349
60 changed files with 2474 additions and 1644 deletions
Download patch file Download diff file Expand all files Collapse all files

3
servatrice/src/servatrice.cpp
View file

@ -176,7 +176,8 @@ bool Servatrice::initServer()
bool registrationEnabled = settingsCache->value("registration/enabled", false).toBool();
bool requireEmailForRegistration = settingsCache->value("registration/requireemail", true).toBool();
qDebug() << "Registration enabled: " << regServerOnly;
qDebug() << "Accept registered users only: " << regServerOnly;
qDebug() << "Registration enabled: " << registrationEnabled;
if (registrationEnabled)
qDebug() << "Require email address to register: " << requireEmailForRegistration;

2
servatrice/src/servatrice_database_interface.cpp
View file

@ -124,6 +124,8 @@ bool Servatrice_DatabaseInterface::execSqlQuery(QSqlQuery *query)
bool Servatrice_DatabaseInterface::usernameIsValid(const QString &user, QString & error)
{
int minNameLength = settingsCache->value("users/minnamelength", 6).toInt();
if(minNameLength < 1)
minNameLength = 1;
int maxNameLength = settingsCache->value("users/maxnamelength", 12).toInt();
bool allowLowercase = settingsCache->value("users/allowlowercase", true).toBool();
bool allowUppercase = settingsCache->value("users/allowuppercase", true).toBool();

2
servatrice/src/servatrice_database_interface.h
View file

@ -9,7 +9,7 @@
#include "server.h"
#include "server_database_interface.h"
#define DATABASE_SCHEMA_VERSION 11
#define DATABASE_SCHEMA_VERSION 12
class Servatrice;