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

Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

Browse source
This commit is contained in:
Max-Wilhelm Bruker 2011-07-05 12:44:46 +02:00
commit 17609ec6f8
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/server.cpp
View file

@ -74,6 +74,7 @@ AuthenticationResult Server::loginUser(Server_ProtocolHandler *session, QString
session->setUserInfo(data);
users.insert(name, session);
qDebug() << "Server::loginUser: name=" << name;
Event_UserJoined *event = new Event_UserJoined(new ServerInfo_User(data, false));
for (int i = 0; i < clients.size(); ++i)
@ -103,8 +104,9 @@ void Server::removeClient(Server_ProtocolHandler *client)
delete event;
users.remove(data->getName());
qDebug() << "Server::removeClient: name=" << data->getName();
}
qDebug() << "Server::removeClient: " << clients.size() << "clients; " << users.size() << "users left";
qDebug() << "Server::removeClient:" << clients.size() << "clients; " << users.size() << "users left";
}
void Server::broadcastRoomUpdate()

1
common/server_protocolhandler.cpp
View file

@ -321,6 +321,7 @@ ResponseCode Server_ProtocolHandler::cmdMessage(Command_Message *cmd, CommandCon
QString receiver = cmd->getUserName();
Server_ProtocolHandler *userHandler = server->getUsers().value(receiver);
qDebug() << "cmdMessage: recv=" << receiver << (userHandler == 0 ? "not found" : "found");
if (!userHandler)
return RespNameNotFound;
if (userHandler->getIgnoreList().contains(userInfo->getName()))

2
servatrice/src/servatrice.cpp
View file

@ -186,7 +186,7 @@ AuthenticationResult Servatrice::checkUserPassword(Server_ProtocolHandler *handl
checkSql();
QSqlQuery query;
query.prepare("select a.password, timediff(now(), date_add(b.time_from, interval b.minutes minute)) < 0, b.minutes <=> 0 from " + dbPrefix + "_users a left join " + dbPrefix + "_bans b on b.id_user = a.id and b.time_from = (select max(c.time_from) from " + dbPrefix + "_bans c where c.id_user = a.id) where a.name = :name and a.active = 1");
query.prepare("select a.password, time_to_sec(timediff(now(), date_add(b.time_from, interval b.minutes minute))) < 0, b.minutes <=> 0 from " + dbPrefix + "_users a left join " + dbPrefix + "_bans b on b.id_user = a.id and b.time_from = (select max(c.time_from) from " + dbPrefix + "_bans c where c.id_user = a.id) where a.name = :name and a.active = 1");
query.bindValue(":name", user);
if (!execSqlQuery(query))
return PasswordWrong;

2
servatrice/src/serversocketinterface.cpp
View file

@ -495,7 +495,7 @@ ResponseCode ServerSocketInterface::cmdBanFromServer(Command_BanFromServer *cmd,
query.bindValue(":id_user", getUserIdInDB(userName));
query.bindValue(":id_admin", getUserIdInDB(userInfo->getName()));
query.bindValue(":minutes", minutes);
query.bindValue(":reason", cmd->getReason());
query.bindValue(":reason", cmd->getReason() + "\n");
servatrice->execSqlQuery(query);
} else {
// Unregistered users must be banned by IP address.