X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=22513abeafdb8c20fc27da671425e4925f43d1ca;hb=63aa8d0d42f619c52d382bde3e6ba2e5e23b12ac;hp=a0b3284e3acd49354cdbf3ce950594811f1049e9;hpb=58d7827bb1bd3d90f38a1c199f6f41ae9f24885c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index a0b3284e3..22513abea 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -57,7 +57,7 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 	 * So, let's write to a temporary file, flush it, then rename the file..
 	 *     -- w00t
 	 */
-	
+
 	// If the user has not specified a configuration file then we don't write one.
 	if (permchannelsconf.empty())
 		return true;
@@ -66,15 +66,16 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 	std::ofstream stream(permchannelsnewconf.c_str());
 	if (!stream.is_open())
 	{
-		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);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot create database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot create new permchan db \"%s\": %s (%d)", permchannelsnewconf.c_str(), 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;
 
-	for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
+	const chan_hash& chans = ServerInstance->GetChans();
+	for (chan_hash::const_iterator i = chans.begin(); i != chans.end(); ++i)
 	{
 		Channel* chan = i->second;
 		if (!chan->IsModeSet(permchanmode))
@@ -136,25 +137,20 @@ static bool WriteDatabase(PermChannel& permchanmode, Module* mod, bool save_list
 
 	if (stream.fail())
 	{
-		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);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot write to new database \"%s\"! %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot write to new permchan db \"%s\": %s (%d)", permchannelsnewconf.c_str(), strerror(errno), errno);
 		return false;
 	}
 	stream.close();
 
 #ifdef _WIN32
-	if (remove(permchannelsconf.c_str()))
-	{
-		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;
-	}
+	remove(permchannelsconf.c_str());
 #endif
 	// Use rename to move temporary to new db - this is guarenteed not to fuck up, even in case of a crash.
 	if (rename(permchannelsnewconf.c_str(), permchannelsconf.c_str()) < 0)
 	{
-		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);
+		ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Cannot replace old database \"%s\" with new database \"%s\"! %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
+		ServerInstance->SNO->WriteToSnoMask('a', "database: cannot replace old permchan db \"%s\" with new db \"%s\": %s (%d)", permchannelsconf.c_str(), permchannelsnewconf.c_str(), strerror(errno), errno);
 		return false;
 	}
 
@@ -165,37 +161,13 @@ class ModulePermanentChannels : public Module
 {
 	PermChannel p;
 	bool dirty;
+	bool loaded;
 	bool save_listmodes;
 public:
 
-	ModulePermanentChannels() : p(this), dirty(false)
-	{
-	}
-
-	CullResult cull()
+	ModulePermanentChannels()
+		: p(this), dirty(false), loaded(false)
 	{
-		/*
-		 * DelMode can't remove the +P mode on empty channels, or it will break
-		 * merging modes with remote servers. Remove the empty channels now as
-		 * we know this is not the case.
-		 */
-		chan_hash::iterator iter = ServerInstance->chanlist->begin();
-		while (iter != ServerInstance->chanlist->end())
-		{
-			Channel* c = iter->second;
-			if (c->GetUserCounter() == 0)
-			{
-				chan_hash::iterator at = iter;
-				iter++;
-				FOREACH_MOD(OnChannelDelete, (c));
-				ServerInstance->chanlist->erase(at);
-				ServerInstance->GlobalCulls.AddItem(c);
-			}
-			else
-				iter++;
-		}
-		ServerInstance->Modes->DelMode(&p);
-		return Module::cull();
 	}
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
@@ -203,6 +175,9 @@ public:
 		ConfigTag* tag = ServerInstance->Config->ConfValue("permchanneldb");
 		permchannelsconf = tag->getString("filename");
 		save_listmodes = tag->getBool("listmodes");
+
+		if (!permchannelsconf.empty())
+			permchannelsconf = ServerInstance->Config->Paths.PrependConfig(permchannelsconf);
 	}
 
 	void LoadDatabase()
@@ -273,9 +248,9 @@ public:
 		}
 	}
 
-	ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt) CXX11_OVERRIDE
+	ModResult OnRawMode(User* user, Channel* chan, ModeHandler* mh, const std::string& param, bool adding) CXX11_OVERRIDE
 	{
-		if (chan && (chan->IsModeSet(p) || mode == p.GetModeChar()))
+		if (chan && (chan->IsModeSet(p) || mh == &p))
 			dirty = true;
 
 		return MOD_RES_PASSTHRU;
@@ -301,8 +276,6 @@ public:
 		// to be able to set the modes they provide (e.g.: m_stripcolor is inited after us)
 		// Prioritize() is called after all module initialization is complete, consequently
 		// all modes are available now
-
-		static bool loaded = false;
 		if (loaded)
 			return;