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

common/server.cpp

@@ -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()

common/server_protocolhandler.cpp

@@ -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()))

servatrice/src/servatrice.cpp

@@ -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;

servatrice/src/serversocketinterface.cpp

@@ -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.