jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 17:44:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Registered Only Server

Browse source 
Allow for registration only server.
This commit is contained in:
woogerboy21 2014-06-30 16:26:57 -04:00
parent 69a8fa0bb1
commit 3c216ac9cd
5 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cockatrice/src/window_main.cpp
View file

@ -1,4 +1,4 @@
/*************************************************************************** /***************************************************************************
* Copyright (C) 2008 by Max-Wilhelm Bruker * * Copyright (C) 2008 by Max-Wilhelm Bruker *
* brukie@gmx.net * * brukie@gmx.net *
* * * *
@ -225,7 +225,7 @@ void MainWindow::actAbout()
+ tr("French:") + " Yannick Hammer, Arnaud Faes<br>" + tr("French:") + " Yannick Hammer, Arnaud Faes<br>"
+ tr("Japanese:") + " Nagase Task<br>" + tr("Japanese:") + " Nagase Task<br>"
+ tr("Russian:") + " Alexander Davidov<br>" + tr("Russian:") + " Alexander Davidov<br>"
// + tr("Czech:") + " Ondřej Trhoň<br>" // + tr("Czech:") + " Ondrej Trhon<br>"
// + tr("Slovak:") + " Ganjalf Rendy<br>" // + tr("Slovak:") + " Ganjalf Rendy<br>"
+ tr("Italian:") + " Luigi Sciolla<br>" + tr("Italian:") + " Luigi Sciolla<br>"
+ tr("Swedish:") + " Jessica Dahl<br>" + tr("Swedish:") + " Jessica Dahl<br>"
@ -261,6 +261,9 @@ void MainWindow::loginError(Response::ResponseCode r, QString reasonStr, quint32
case Response::RespUsernameInvalid: case Response::RespUsernameInvalid:
QMessageBox::critical(this, tr("Error"), tr("Invalid username.")); QMessageBox::critical(this, tr("Error"), tr("Invalid username."));
break; break;
case Response::RespRegRequired:
QMessageBox::critical(this, tr("Error"), tr("This server requires user registration."));
break;
default: default:
QMessageBox::critical(this, tr("Error"), tr("Unknown login error: %1").arg(static_cast<int>(r))); QMessageBox::critical(this, tr("Error"), tr("Unknown login error: %1").arg(static_cast<int>(r)));
} }

1
common/pb/response.proto
View file

@ -23,6 +23,7 @@ message Response {
RespUserIsBanned = 19; RespUserIsBanned = 19;
RespAccessDenied = 20; RespAccessDenied = 20;
RespUsernameInvalid = 21; RespUsernameInvalid = 21;
RespRegRequired = 22;
} }
enum ResponseType { enum ResponseType {
JOIN_ROOM = 1000; JOIN_ROOM = 1000;

6
common/server.cpp
View file

@ -34,6 +34,7 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QThread> #include <QThread>
#include <QDebug> #include <QDebug>
#include <QSettings>
Server::Server(bool _threaded, QObject *parent) Server::Server(bool _threaded, QObject *parent)
: QObject(parent), threaded(_threaded), nextLocalGameId(0) : QObject(parent), threaded(_threaded), nextLocalGameId(0)
@ -131,6 +132,11 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
} else if (authState == UnknownUser) { } else if (authState == UnknownUser) {
// Change user name so that no two users have the same names, // Change user name so that no two users have the same names,
// don't interfere with registered user names though. // don't interfere with registered user names though.
QSettings *settings = new QSettings("servatrice.ini", QSettings::IniFormat);
bool requireReg = settings->value("server/regonly").toBool();
if (requireReg)
return RegistrationRequired;
QString tempName = name; QString tempName = name;
int i = 0; int i = 0;
while (users.contains(tempName) || databaseInterface->userExists(tempName) || databaseInterface->userSessionExists(tempName)) while (users.contains(tempName) || databaseInterface->userExists(tempName) || databaseInterface->userSessionExists(tempName))

1
common/server_protocolhandler.cpp
View file

@ -345,6 +345,7 @@ Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd
case NotLoggedIn: return Response::RespWrongPassword; case NotLoggedIn: return Response::RespWrongPassword;
case WouldOverwriteOldSession: return Response::RespWouldOverwriteOldSession; case WouldOverwriteOldSession: return Response::RespWouldOverwriteOldSession;
case UsernameInvalid: return Response::RespUsernameInvalid; case UsernameInvalid: return Response::RespUsernameInvalid;
case RegistrationRequired: return Response::RespRegRequired;
default: authState = res; default: authState = res;
} }

1
servatrice/servatrice.ini.example
View file

@ -7,6 +7,7 @@ id=1
number_pools=1 number_pools=1
writelog=1 writelog=1
logfilters="" logfilters=""
regonly=0
[servernetwork] [servernetwork]
active=0 active=0