X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_permchannels.cpp;h=8958cdfcd67199dd7cd01d3be3aad8ba4d920523;hb=e59bb59ea29e73bf66139e9d5eab6d1b572e308d;hp=a3d023ffe39fdd57f8eed96f474bc8c16a90d63e;hpb=490446040d80d144e64ddf8e52515df1f40f1fd7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_permchannels.cpp b/src/modules/m_permchannels.cpp
index a3d023ffe..8958cdfcd 100644
--- a/src/modules/m_permchannels.cpp
+++ b/src/modules/m_permchannels.cpp
@@ -1,16 +1,23 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008-2009 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"
 
 /* $ModDesc: Provides support for channel mode +P to provide permanent channels */
@@ -42,6 +49,7 @@ static bool WriteDatabase()
 		return false;
 	}
 
+	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++)
 	{
@@ -92,6 +100,14 @@ static bool WriteDatabase()
 		return false;
 	}
 
+#ifdef _WIN32
+	if (remove(permchannelsconf.c_str()))
+	{
+		ServerInstance->Logs->Log("m_permchannels",DEFAULT, "permchannels: 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)
 	{
@@ -119,9 +135,6 @@ class PermChannel : public ModeHandler
 			if (!channel->IsModeSet('P'))
 			{
 				channel->SetMode('P',true);
-
-				// Save permchannels db if needed.
-				WriteDatabase();
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -129,33 +142,11 @@ class PermChannel : public ModeHandler
 		{
 			if (channel->IsModeSet('P'))
 			{
-				if (channel->GetUserCounter() == 0 && !IS_SERVER(source))
+				channel->SetMode(this,false);
+				if (channel->GetUserCounter() == 0)
 				{
-					/*
-					 * ugh, ugh, UGH!
-					 *
-					 * We can't delete this channel the way things work at the moment,
-					 * because of the following scenario:
-					 * s1:#c <-> s2:#c
-					 *
-					 * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
-					 *
-					 * On netmerge, s2 loses, so s2 removes all modes (including +P) which
-					 * would subsequently delete the channel here causing big fucking problems.
-					 *
-					 * I don't think there's really a way around this, so just deny -P on a 0 user chan.
-					 * -- w00t
-					 *
-					 * delete channel;
-					 */
-					return MODEACTION_DENY;
+					channel->DelUser(ServerInstance->FakeClient);
 				}
-
-				/* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
-				channel->SetMode('P',false);
-
-				// Save permchannels db if needed.
-				WriteDatabase();
 				return MODEACTION_ALLOW;
 			}
 		}
@@ -167,14 +158,18 @@ class PermChannel : public ModeHandler
 class ModulePermanentChannels : public Module
 {
 	PermChannel p;
+	bool dirty;
 public:
 
-	ModulePermanentChannels() : p(this)
+	ModulePermanentChannels() : p(this), dirty(false)
 	{
-		if (!ServerInstance->Modes->AddMode(&p))
-			throw ModuleException("Could not add new modes!");
-		Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 4);
+	}
+
+	void init()
+	{
+		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);
 	}
@@ -276,8 +271,8 @@ public:
 
 	virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string &param, bool adding, int pcnt)
 	{
-		if (chan && chan->IsModeSet('P'))
-			WriteDatabase();
+		if (chan && (chan->IsModeSet('P') || mode == 'P'))
+			dirty = true;
 
 		return MOD_RES_PASSTHRU;
 	}
@@ -285,7 +280,14 @@ public:
 	virtual void OnPostTopicChange(User*, Channel *c, const std::string&)
 	{
 		if (c->IsModeSet('P'))
+			dirty = true;
+	}
+
+	void OnBackgroundTimer(time_t)
+	{
+		if (dirty)
 			WriteDatabase();
+		dirty = false;
 	}
 
 	virtual Version GetVersion()