X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=1a7fd8cc5f9c6c8d46a94581ddf3b320aa7664e8;hb=7e0e54eba331339606265a8a4e11417bb2f832ba;hp=26c10860924bf108941f2a9dd7bf6f695101a15d;hpb=cc1d8c1d57abc36effdc1e9383e4d7f5a3ea9ab0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 26c108609..1a7fd8cc5 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -31,18 +31,16 @@ class ModuleXLineDB : public Module
 	{
 		/* Load the configuration
 		 * Note:
-		 * 		this is on purpose not in the OnRehash() method. It would be non-trivial to change the database on-the-fly.
+		 * 		This is on purpose not changed on a rehash. It would be non-trivial to change the database on-the-fly.
 		 * 		Imagine a scenario where the new file already exists. Merging the current XLines with the existing database is likely a bad idea
 		 * 		...and so is discarding all current in-memory XLines for the ones in the database.
 		 */
 		ConfigTag* Conf = ServerInstance->Config->ConfValue("xlinedb");
-		xlinedbpath = Conf->getString("filename", DATA_PATH "/xline.db");
+		xlinedbpath = ServerInstance->Config->Paths.PrependData(Conf->getString("filename", "xline.db"));
 
 		// Read xlines before attaching to events
 		ReadDatabase();
 
-		Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		dirty = false;
 	}
 
@@ -158,7 +156,7 @@ class ModuleXLineDB : public Module
 	bool ReadDatabase()
 	{
 		// If the xline database doesn't exist then we don't need to load it.
-		if (!ServerConfig::FileExists(xlinedbpath.c_str()))
+		if (!FileSystem::FileExists(xlinedbpath))
 			return true;
 
 		std::ifstream stream(xlinedbpath.c_str());
@@ -168,7 +166,7 @@ class ModuleXLineDB : public Module
 			ServerInstance->SNO->WriteToSnoMask('a', "database: cannot read db: %s (%d)", strerror(errno), errno);
 			return false;
 		}
-		
+
 		std::string line;
 		while (std::getline(stream, line))
 		{