X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=fcb2ef6d74d7fda8d38bcfbe0bb34138cb7ca19e;hb=e950f568d0f571e9475aa38177486468714de4d3;hp=9b43649a815e5db24cc21722d98d6672adc1ecf5;hpb=8f27fefa75e2952e7ab8757eb9fe4af4586817f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 9b43649a8..fcb2ef6d7 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -19,8 +19,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Implements config tags which allow changing characters allowed in channel names */
-
 static std::bitset<256> allowedmap;
 
 class NewIsChannelHandler : public HandlerBase1<bool, const std::string&>
@@ -51,17 +49,19 @@ class ModuleChannelNames : public Module
 	NewIsChannelHandler myhandler;
 	caller1<bool, const std::string&> rememberer;
 	bool badchan;
+	ChanModeReference permchannelmode;
 
  public:
-	ModuleChannelNames() : rememberer(ServerInstance->IsChannel), badchan(false)
+	ModuleChannelNames()
+		: rememberer(ServerInstance->IsChannel)
+		, badchan(false)
+		, permchannelmode(this, "permanent")
 	{
 	}
 
 	void init() CXX11_OVERRIDE
 	{
 		ServerInstance->IsChannel = &myhandler;
-		Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
-		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 		OnRehash(NULL);
 	}
 
@@ -78,18 +78,26 @@ class ModuleChannelNames : public Module
 		while (c2 != chanvec.rend())
 		{
 			Channel* c = *c2++;
-			if (c->IsModeSet('P') && c->GetUserCounter())
+			if (c->IsModeSet(permchannelmode) && c->GetUserCounter())
 			{
 				std::vector<std::string> modes;
 				modes.push_back(c->name);
-				modes.push_back("-P");
+				modes.push_back(std::string("-") + permchannelmode->GetModeChar());
 
-				ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
+				ServerInstance->Modes->Process(modes, ServerInstance->FakeClient);
 			}
 			const UserMembList* users = c->GetUsers();
-			for(UserMembCIter j = users->begin(); j != users->end(); ++j)
+			for(UserMembCIter j = users->begin(); j != users->end(); )
+			{
 				if (IS_LOCAL(j->first))
-					c->KickUser(ServerInstance->FakeClient, j->first, "Channel name no longer valid");
+				{
+					// KickUser invalidates the iterator
+					UserMembCIter it = j++;
+					c->KickUser(ServerInstance->FakeClient, it->first, "Channel name no longer valid");
+				}
+				else
+					++j;
+			}
 		}
 		badchan = false;
 	}