X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_xline_db.cpp;h=1918f3fc5c56f6d8695e038364b9b5b63b9e71f0;hb=9c5629085ae4914f9db514ca6fbd94e8d58c6f31;hp=365602b7ebe937518777eb853fcf8dfa43ce2991;hpb=70501004436bb9de15b845e865054e2ca7004f5f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index 365602b7e..1918f3fc5 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -25,7 +25,6 @@
 
 class ModuleXLineDB : public Module
 {
-	std::vector<XLine *> xlines;
 	bool reading_db;			// If this is true, addlines are as a result of db reading, so don't bother flushing the db to disk.
 						// DO REMEMBER TO SET IT, otherwise it's annoying :P
  public:
@@ -50,7 +49,6 @@ class ModuleXLineDB : public Module
 	void OnAddLine(User* source, XLine* line)
 	{
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Adding a line");
-		xlines.push_back(line);
 
 		if (!reading_db)
 		{
@@ -76,15 +74,6 @@ class ModuleXLineDB : public Module
 	void RemoveLine(XLine *line)
 	{
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Removing a line");
-		for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
-		{
-			if ((*i) == line)
-			{
-				xlines.erase(i);
-				break;
-			}
-		}
-
 		WriteDatabase();
 	}
 
@@ -119,12 +108,19 @@ class ModuleXLineDB : public Module
 		fprintf(f, "VERSION 1\n");
 
 		// Now, let's write.
-		XLine *line;
-		for (std::vector<XLine *>::iterator i = xlines.begin(); i != xlines.end(); i++)
+		std::vector<std::string> types = ServerInstance->XLines->GetAllTypes();
+		for (std::vector<std::string>::const_iterator it = types.begin(); it != types.end(); ++it)
 		{
-			line = (*i);
-			fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
-				ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
+			XLineLookup* lookup = ServerInstance->XLines->GetAll(*it);
+			if (!lookup)
+				continue;
+
+			for (LookupIter i = lookup->begin(); i != lookup->end(); ++i)
+			{
+				XLine *line = i->second;
+				fprintf(f, "LINE %s %s %s %lu %lu :%s\n", line->type.c_str(), line->Displayable(),
+					ServerInstance->Config->ServerName.c_str(), (unsigned long)line->set_time, (unsigned long)line->duration, line->reason.c_str());
+			}
 		}
 
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Finished writing XLines. Checking for error..");
@@ -235,6 +231,8 @@ class ModuleXLineDB : public Module
 				{
 					ServerInstance->SNO->WriteToSnoMask('x', "database: Added a line of type %s", command_p[1].c_str());
 				}
+				else
+					delete xl;
 			}
 		}