1 files changed, 105 insertions, 4 deletions

diff --git a/src/RankManager.cpp b/src/RankManager.cpp
index e5896f8f3..451de88e7 100644
--- a/src/RankManager.cpp
+++ b/src/RankManager.cpp
@@ -5,7 +5,7 @@
 
 #include "Globals.h"
 #include "RankManager.h"
-#include "inifile/iniFile.h"
+#include "IniFile.h"
 #include "Protocol/MojangAPI.h"
 #include "ClientHandle.h"
 
@@ -384,7 +384,7 @@ protected:
 cRankManager::cRankManager(void) :
 	m_DB("Ranks.sqlite", SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE),
 	m_IsInitialized(false),
-	m_MojangAPI(NULL)
+	m_MojangAPI(nullptr)
 {
 }
 
@@ -394,9 +394,9 @@ cRankManager::cRankManager(void) :
 
 cRankManager::~cRankManager()
 {
-	if (m_MojangAPI != NULL)
+	if (m_MojangAPI != nullptr)
 	{
-		m_MojangAPI->SetRankManager(NULL);
+		m_MojangAPI->SetRankManager(nullptr);
 	}
 }
 
@@ -496,6 +496,33 @@ AString cRankManager::GetPlayerRankName(const AString & a_PlayerUUID)
 
 
 
+AString cRankManager::GetPlayerName(const AString & a_PlayerUUID)
+{
+	ASSERT(m_IsInitialized);
+	cCSLock Lock(m_CS);
+
+	try
+	{
+		// Prepare the DB statement:
+		SQLite::Statement stmt(m_DB, "SELECT PlayerName FROM PlayerRank WHERE PlayerUUID = ?");
+		stmt.bind(1, a_PlayerUUID);
+
+		if (stmt.executeStep())
+		{
+			return stmt.getColumn(0).getText();
+		}
+	}
+	catch (SQLite::Exception & ex)
+	{
+		LOGWARNING("%s: Cannot get player name: %s", __FUNCTION__, ex.what());
+	}
+	return AString();
+}
+
+
+
+
+
 AStringVector cRankManager::GetPlayerGroups(const AString & a_PlayerUUID)
 {
 	ASSERT(m_IsInitialized);
@@ -636,6 +663,32 @@ AStringVector cRankManager::GetRankPermissions(const AString & a_RankName)
 
 
 
+AStringVector cRankManager::GetAllPlayerUUIDs(void)
+{
+	ASSERT(m_IsInitialized);
+	cCSLock Lock(m_CS);
+
+	AStringVector res;
+	try
+	{
+		SQLite::Statement stmt(m_DB, "SELECT PlayerUUID FROM PlayerRank ORDER BY PlayerName COLLATE NOCASE");
+		while (stmt.executeStep())
+		{
+			res.push_back(stmt.getColumn(0).getText());
+		}
+	}
+	catch (const SQLite::Exception & ex)
+	{
+		LOGWARNING("%s: Failed to get players from DB: %s", __FUNCTION__, ex.what());
+	}
+	return res;
+}
+
+
+
+
+
+
 AStringVector cRankManager::GetAllRanks(void)
 {
 	ASSERT(m_IsInitialized);
@@ -1764,6 +1817,54 @@ bool cRankManager::SetDefaultRank(const AString & a_RankName)
 
 
 
+void cRankManager::ClearPlayerRanks(void)
+{
+	ASSERT(m_IsInitialized);
+	cCSLock Lock(m_CS);
+
+	try
+	{
+		SQLite::Statement stmt(m_DB, "DELETE FROM PlayerRank");
+		stmt.exec();
+	}
+	catch (SQLite::Exception & ex)
+	{
+		LOGWARNING("%s: Failed to remove/clear all players: %s", __FUNCTION__, ex.what());
+	}
+}
+
+
+
+
+
+bool cRankManager::UpdatePlayerName(const AString & a_PlayerUUID, const AString & a_NewPlayerName)
+{
+	ASSERT(m_IsInitialized);
+	cCSLock Lock(m_CS);
+
+	try
+	{
+		SQLite::Statement stmt(m_DB, "UPDATE PlayerRank SET PlayerName = ? WHERE PlayerUUID = ?");
+		stmt.bind(1, a_NewPlayerName);
+		stmt.bind(2, a_PlayerUUID);
+		if (stmt.exec() > 0)
+		{
+			// The player name was changed, returns true
+			return true;
+		}
+	}
+	catch (const SQLite::Exception & ex)
+	{
+		LOGWARNING("%s: Failed to update player name from UUID %s: %s", __FUNCTION__, a_PlayerUUID.c_str(), ex.what());
+	}
+	return false;
+}
+
+
+
+
+
+
 bool cRankManager::AreDBTablesEmpty(void)
 {
 	return (