gitea-mirror/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2025-12-22 23:26:14 -08:00
Code Issues Packages Projects Releases Wiki Activity

Commit to resolve requests made by @Daenyth discussed after the commit.

Browse Source 
See https://github.com/Cockatrice/Cockatrice/pull/1340 for details.
This commit is contained in:
woogerboy21
2015-08-07 13:21:31 -04:00
parent 62dc3a7ca3
commit 94942e1a92
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/server_protocolhandler.cpp
View File

@@ -381,12 +381,16 @@ Response::ResponseCode Server_ProtocolHandler::cmdPing(const Command_Ping & /*cm
Response::ResponseCode Server_ProtocolHandler::cmdLogin(const Command_Login &cmd, ResponseContainer &rc)
{
QString userName = QString::fromStdString(cmd.user_name()).simplified();
QString clientid = QString::fromStdString(cmd.clientid()).simplified();
QString clientId = QString::fromStdString(cmd.clientid()).simplified();
if (userName.isEmpty() || (userInfo != 0))
return Response::RespContextError;
if (clientId.isEmpty())
return Response::RespContextError;
QString reasonStr;
int banSecondsLeft = 0;
AuthenticationResult res = server->loginUser(this, userName, QString::fromStdString(cmd.password()), reasonStr, banSecondsLeft, clientid);
AuthenticationResult res = server->loginUser(this, userName, QString::fromStdString(cmd.password()), reasonStr, banSecondsLeft, clientId);
switch (res) {
case UserIsBanned: {
Response_Login *re = new Response_Login;