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

diff --git a/src/modules/m_xline_db.cpp b/src/modules/m_xline_db.cpp
index efd6a9c1d..1918f3fc5 100644
--- a/src/modules/m_xline_db.cpp
+++ b/src/modules/m_xline_db.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 #include "xline.h"
 
@@ -18,12 +25,10 @@
 
 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:
-	ModuleXLineDB(InspIRCd* Me) : Module(Me)
-	{
+	ModuleXLineDB() 	{
 		Implementation eventlist[] = { I_OnAddLine, I_OnDelLine, I_OnExpireLine };
 		ServerInstance->Modules->Attach(eventlist, this, 3);
 
@@ -44,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)
 		{
@@ -70,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();
 	}
 
@@ -93,7 +88,7 @@ class ModuleXLineDB : public Module
 		 *		-- w00t
 		 */
 		ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Opening temporary database");
-		f = fopen("xline.db.new", "w");
+		f = fopen("data/xline.db.new", "w");
 		if (!f)
 		{
 			ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot create database! %s (%d)", strerror(errno), errno);
@@ -113,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, (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..");
@@ -134,7 +136,7 @@ class ModuleXLineDB : public Module
 		}
 
 		// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
-		if (rename("xline.db.new", "xline.db") < 0)
+		if (rename("data/xline.db.new", "data/xline.db") < 0)
 		{
 			ServerInstance->Logs->Log("m_xline_db",DEBUG, "xlinedb: Cannot move new to old database! %s (%d)", strerror(errno), errno);
 			ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old with new db: %s (%d)", strerror(errno), errno);
@@ -150,7 +152,7 @@ class ModuleXLineDB : public Module
 		char linebuf[MAXBUF];
 		unsigned int lineno = 0;
 
-		f = fopen("xline.db", "r");
+		f = fopen("data/xline.db", "r");
 		if (!f)
 		{
 			if (errno == ENOENT)
@@ -229,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;
 			}
 		}
 
@@ -240,7 +244,7 @@ class ModuleXLineDB : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version("Keeps a dynamic log of all XLines created, and stores them in a seperate conf file (xline.db).", VF_VENDOR, API_VERSION);
+		return Version("Keeps a dynamic log of all XLines created, and stores them in a separate conf file (xline.db).", VF_VENDOR);
 	}
 };