From b6723e5ebf822193eb63b034c7abd24234d13e83 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Sat, 28 Aug 2010 10:50:17 +0000
Subject: [PATCH] Store server database config in config file.

---
 src/config/configfile.cpp            |  7 ++++++-
 src/net/common/serverlobbythread.cpp | 25 +++++++++++++++----------
 src/net/serverlobbythread.h          |  4 ++--
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index be8919bf..edb27c3a 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -50,7 +50,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
     myConfigState = OK;
 
     // !!!! Revisionsnummer der Configdefaults !!!!!
-    configRev = 83;
+	configRev = 84;
 
     //standard defaults
     logOnOffDefault = "1";
@@ -274,6 +274,11 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
     configList.push_back(ConfigInfo("InternetSavePassword", CONFIG_TYPE_INT, "0"));
     configList.push_back(ConfigInfo("IfInfoMessageShowList", CONFIG_TYPE_STRING_LIST, "Msg"));
     configList.push_back(ConfigInfo("PlayerIgnoreList", CONFIG_TYPE_STRING_LIST, "Player"));
+	configList.push_back(ConfigInfo("DBServerAddress", CONFIG_TYPE_STRING, "127.0.0.1"));
+	configList.push_back(ConfigInfo("DBServerUser", CONFIG_TYPE_STRING, "pokerth"));
+	configList.push_back(ConfigInfo("DBServerPassword", CONFIG_TYPE_STRING, ""));
+	configList.push_back(ConfigInfo("DBServerDatabaseName", CONFIG_TYPE_STRING, "pokerth"));
+	configList.push_back(ConfigInfo("DBServerEncryptionKey", CONFIG_TYPE_STRING, ""));
 
     //fill tempList firstTime
     configBufferList = configList;
diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index 862a7dac..d844fcac 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -161,10 +161,10 @@ private:
 };
 
 
-ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ServerMode mode, ServerIrcBotCallback &ircBotCb, ConfigFile *playerConfig,
+ServerLobbyThread::ServerLobbyThread(GuiInterface &gui, ServerMode mode, ServerIrcBotCallback &ircBotCb, ConfigFile *serverConfig,
 									 AvatarManager &avatarManager, boost::shared_ptr<boost::asio::io_service> ioService)
 : m_ioService(ioService), m_authContext(NULL), m_gui(gui), m_ircBotCb(ircBotCb), m_avatarManager(avatarManager),
-  m_mode(mode), m_playerConfig(playerConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
+  m_mode(mode), m_serverConfig(serverConfig), m_curGameId(0), m_curUniquePlayerId(0), m_curSessionId(INVALID_SESSION + 1),
   m_statDataChanged(false), m_removeGameTimer(*ioService), m_removePlayerTimer(*ioService),
   m_sessionTimeoutTimer(*ioService), m_avatarCleanupTimer(*ioService),
   m_saveStatisticsTimer(*ioService), m_loginLockTimer(*ioService),
@@ -197,7 +197,12 @@ ServerLobbyThread::Init(const string &logDir)
 			ReadStatisticsFile();
 		}
 	}
-	m_database->Init("127.0.0.1", "user", "password", "database", "key");
+	m_database->Init(
+		m_serverConfig->readConfigString("DBServerAddress"),
+		m_serverConfig->readConfigString("DBServerUser"),
+		m_serverConfig->readConfigString("DBServerPassword"),
+		m_serverConfig->readConfigString("DBServerDatabaseName"),
+		m_serverConfig->readConfigString("DBServerEncryptionKey"));
 }
 
 void
@@ -788,14 +793,14 @@ ServerLobbyThread::ClearAuthContext()
 void
 ServerLobbyThread::InitChatCleaner()
 {
-	if (m_playerConfig->readConfigInt("UseChatCleaner") != 0)
+	if (m_serverConfig->readConfigInt("UseChatCleaner") != 0)
 	{
 		m_chatCleanerManager->Init(
-				m_playerConfig->readConfigString("ChatCleanerHostAddress"),
-				m_playerConfig->readConfigInt("ChatCleanerPort"),
-				m_playerConfig->readConfigInt("ChatCleanerUseIpv6") != 0,
-				m_playerConfig->readConfigString("ChatCleanerClientAuth"),
-				m_playerConfig->readConfigString("ChatCleanerServerAuth"));
+				m_serverConfig->readConfigString("ChatCleanerHostAddress"),
+				m_serverConfig->readConfigInt("ChatCleanerPort"),
+				m_serverConfig->readConfigInt("ChatCleanerUseIpv6") != 0,
+				m_serverConfig->readConfigString("ChatCleanerClientAuth"),
+				m_serverConfig->readConfigString("ChatCleanerServerAuth"));
 	}
 }
 
@@ -1345,7 +1350,7 @@ ServerLobbyThread::HandleNetPacketCreateGame(SessionWrapper session, const std::
 				tmpData,
 				session.playerData->GetUniqueId(),
 				GetGui(),
-				m_playerConfig));
+				m_serverConfig));
 		game->Init();
 
 		// Add game to list of games.
diff --git a/src/net/serverlobbythread.h b/src/net/serverlobbythread.h
index e10a798e..22ea1574 100644
--- a/src/net/serverlobbythread.h
+++ b/src/net/serverlobbythread.h
@@ -52,7 +52,7 @@ struct Gsasl;
 class ServerLobbyThread : public Thread, public boost::enable_shared_from_this<ServerLobbyThread>
 {
 public:
-	ServerLobbyThread(GuiInterface &gui, ServerMode mode, ServerIrcBotCallback &ircBotCb, ConfigFile *playerConfig, AvatarManager &avatarManager,
+	ServerLobbyThread(GuiInterface &gui, ServerMode mode, ServerIrcBotCallback &ircBotCb, ConfigFile *serverConfig, AvatarManager &avatarManager,
 		boost::shared_ptr<boost::asio::io_service> ioService);
 	virtual ~ServerLobbyThread();
 
@@ -225,7 +225,7 @@ private:
 
 	ServerMode m_mode;
 	std::string m_statisticsFileName;
-	ConfigFile *m_playerConfig;
+	ConfigFile *m_serverConfig;
 	u_int32_t m_curGameId;
 
 	u_int32_t m_curUniquePlayerId;