X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=b8e5ea5e81802f5dee9dbfa0a1c75fb8ff266906;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=41477ba35000246c0949f4a4467a483f5c90bd4d;hpb=2ac7d154d9dadbc3d836434b786aa0e8c1660381;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index 41477ba35..b8e5ea5e8 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -19,99 +19,91 @@
 
 
 #include "inspircd.h"
+#include <fstream>
 
-/* $ModDesc: Provides support for channel mode +P to provide permanent channels */
 
-// Not in a class due to circular dependancy hell.
-static std::string permchannelsconf;
-static bool WriteDatabase()
+/** Handles the +P channel mode
+ */
+class PermChannel : public ModeHandler
 {
-	FILE *f;
-
-	if (permchannelsconf.empty())
+ public:
+	PermChannel(Module* Creator)
+		: ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL)
 	{
-		// Fake success.
-		return true;
+		oper = true;
 	}
 
-	std::string tempname = permchannelsconf + ".tmp";
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding)
+	{
+		if (adding == channel->IsModeSet(this))
+			return MODEACTION_DENY;
+
+		channel->SetMode(this, adding);
+		if (!adding)
+			channel->CheckDestroy();
+
+		return MODEACTION_ALLOW;
+	}
+};
 
+// Not in a class due to circular dependancy hell.
+static std::string permchannelsconf;
+static bool WriteDatabase(PermChannel& permchanmode)
+{
 	/*
 	 * We need to perform an atomic write so as not to fuck things up.
-	 * So, let's write to a temporary file, flush and sync the FD, then rename the file..
-	 *		-- w00t
+	 * So, let's write to a temporary file, flush it, then rename the file..
+	 *     -- w00t
 	 */
-	f = fopen(tempname.c_str(), "w");
-	if (!f)
+	
+	// If the user has not specified a configuration file then we don't write one.
+	if (permchannelsconf.empty())
+		return true;
+
+	std::string permchannelsnewconf = permchannelsconf + ".tmp";
+	std::ofstream stream(permchannelsnewconf.c_str());
+	if (!stream.is_open())
 	{
-		ServerInstance->Logs->Log("m_permchannels", LOG_DEFAULT, "permchannels: Cannot create database! %s (%d)", strerror(errno), errno);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot create database! %s (%d)", strerror(errno), errno);
 		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new db: %s (%d)", strerror(errno), errno);
 		return false;
 	}
+	
+	stream << "# This file is automatically generated by m_permchannels. Any changes will be overwritten." << std::endl
+		<< "<config format=\"xml\">" << std::endl;
 
-	fputs("# Permchannels DB\n# This file is autogenerated; any changes will be overwritten!\n<config format=\"compat\">\n", f);
-	// Now, let's write.
 	for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
 	{
 		Channel* chan = i->second;
-		if (!chan->IsModeSet('P'))
+		if (!chan->IsModeSet(permchanmode))
 			continue;
 
-		char line[1024];
-		const char* items[] =
-		{
-			"<permchannels channel=",
-			chan->name.c_str(),
-			" topic=",
-			chan->topic.c_str(),
-			" modes=",
-			chan->ChanModes(true),
-			">\n"
-		};
-
-		int lpos = 0, item = 0, ipos = 0;
-		while (lpos < 1022 && item < 7)
-		{
-			char c = items[item][ipos++];
-			if (c == 0)
-			{
-				// end of this string; hop to next string, insert a quote
-				item++;
-				ipos = 0;
-				c = '"';
-			}
-			else if (c == '\\' || c == '"')
-			{
-				line[lpos++] = '\\';
-			}
-			line[lpos++] = c;
-		}
-		line[--lpos] = 0;
-		fputs(line, f);
+		stream << "<permchannels channel=\"" << ServerConfig::Escape(chan->name)
+			<< "\" topic=\"" << ServerConfig::Escape(chan->topic)
+			<< "\" modes=\"" << ServerConfig::Escape(chan->ChanModes(true))
+			<< "\">" << std::endl;
 	}
 
-	int write_error = 0;
-	write_error = ferror(f);
-	write_error |= fclose(f);
-	if (write_error)
+	if (stream.fail())
 	{
-		ServerInstance->Logs->Log("m_permchannels", LOG_DEFAULT, "permchannels: Cannot write to new database! %s (%d)", strerror(errno), errno);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot write to new database! %s (%d)", strerror(errno), errno);
 		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new db: %s (%d)", strerror(errno), errno);
 		return false;
 	}
+	stream.close();
 
 #ifdef _WIN32
 	if (remove(permchannelsconf.c_str()))
 	{
-		ServerInstance->Logs->Log("m_permchannels", LOG_DEFAULT, "permchannels: Cannot remove old database! %s (%d)", strerror(errno), errno);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot remove old database! %s (%d)", strerror(errno), errno);
 		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot remove old database: %s (%d)", strerror(errno), errno);
 		return false;
 	}
 #endif
 	// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
-	if (rename(tempname.c_str(), permchannelsconf.c_str()) < 0)
+	if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0)
 	{
-		ServerInstance->Logs->Log("m_permchannels", LOG_DEFAULT, "permchannels: Cannot move new to old database! %s (%d)", strerror(errno), errno);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "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);
 		return false;
 	}
@@ -119,39 +111,6 @@ static bool WriteDatabase()
 	return true;
 }
 
-
-
-/** Handles the +P channel mode
- */
-class PermChannel : public ModeHandler
-{
- public:
-	PermChannel(Module* Creator) : ModeHandler(Creator, "permanent", 'P', PARAM_NONE, MODETYPE_CHANNEL) { oper = true; }
-
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-	{
-		if (adding)
-		{
-			if (!channel->IsModeSet('P'))
-			{
-				channel->SetMode('P',true);
-				return MODEACTION_ALLOW;
-			}
-		}
-		else
-		{
-			if (channel->IsModeSet('P'))
-			{
-				channel->SetMode(this,false);
-				channel->CheckDestroy();
-				return MODEACTION_ALLOW;
-			}
-		}
-
-		return MODEACTION_DENY;
-	}
-};
-
 class ModulePermanentChannels : public Module
 {
 	PermChannel p;
@@ -165,8 +124,6 @@ public:
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->Modules->AddService(p);
-		Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 		OnRehash(NULL);
 	}
@@ -186,7 +143,7 @@ public:
 			{
 				chan_hash::iterator at = iter;
 				iter++;
-				FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(c));
+				FOREACH_MOD(OnChannelDelete, (c));
 				ServerInstance->chanlist->erase(at);
 				ServerInstance->GlobalCulls.AddItem(c);
 			}
@@ -218,7 +175,7 @@ public:
 
 			if (channel.empty())
 			{
-				ServerInstance->Logs->Log("m_permchannels", LOG_DEBUG, "Malformed permchannels tag with empty channel name.");
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Malformed permchannels tag with empty channel name.");
 				continue;
 			}
 
@@ -229,7 +186,7 @@ public:
 				c = new Channel(channel, ServerInstance->Time());
 				if (!topic.empty())
 				{
-					c->SetTopic(ServerInstance->FakeClient, topic, true);
+					c->SetTopic(ServerInstance->FakeClient, topic);
 
 					/*
 					 * Due to the way protocol works in 1.2, we need to hack the topic TS in such a way that this
@@ -239,7 +196,7 @@ public:
 					 */
 					c->topicset = 42;
 				}
-				ServerInstance->Logs->Log("m_permchannels", LOG_DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
 
 				if (modes.empty())
 					continue;
@@ -270,7 +227,7 @@ public:
 
 	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt) CXX11_OVERRIDE
 	{
-		if (chan && (chan->IsModeSet('P') || mode == 'P'))
+		if (chan && (chan->IsModeSet(p) || mode == p.GetModeChar()))
 			dirty = true;
 
 		return MOD_RES_PASSTHRU;
@@ -278,14 +235,14 @@ public:
 
 	void OnPostTopicChange(User*, Channel *c, const std::string&) CXX11_OVERRIDE
 	{
-		if (c->IsModeSet('P'))
+		if (c->IsModeSet(p))
 			dirty = true;
 	}
 
 	void OnBackgroundTimer(time_t) CXX11_OVERRIDE
 	{
 		if (dirty)
-			WriteDatabase();
+			WriteDatabase(p);
 		dirty = false;
 	}
 
@@ -316,7 +273,7 @@ public:
 			}
 			catch (CoreException& e)
 			{
-				ServerInstance->Logs->Log("m_permchannels", LOG_DEFAULT, "Error loading permchannels database: " + std::string(e.GetReason()));
+				ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Error loading permchannels database: " + std::string(e.GetReason()));
 			}
 		}
 	}
@@ -328,7 +285,7 @@ public:
 
 	ModResult OnChannelPreDelete(Channel *c) CXX11_OVERRIDE
 	{
-		if (c->IsModeSet('P'))
+		if (c->IsModeSet(p))
 			return MOD_RES_DENY;
 
 		return MOD_RES_PASSTHRU;