X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_channames.cpp;h=0826fa56a91354e40e933241ff3ef43d346d3de5;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=8b75a06a73c02dfce55b9a1439d0cc9a41e08f4a;hpb=13618fb4e55b3256d846829d00e4116a4ca42099;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_channames.cpp b/src/modules/m_channames.cpp
index 8b75a06a7..0826fa56a 100644
--- a/src/modules/m_channames.cpp
+++ b/src/modules/m_channames.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -19,9 +19,8 @@ static bool allowedmap[256];
 
 class NewIsChannelHandler : public HandlerBase2<bool, const char*, size_t>
 {
-	InspIRCd* Server;
  public:
-	NewIsChannelHandler(InspIRCd* Srv) : Server(Srv) { }
+	NewIsChannelHandler() { }
 	virtual ~NewIsChannelHandler() { }
 	virtual bool Call(const char*, size_t);
 };
@@ -44,19 +43,14 @@ bool NewIsChannelHandler::Call(const char* chname, size_t max)
 class ModuleChannelNames : public Module
 {
  private:
-	InspIRCd* ServerInstance;
-	NewIsChannelHandler* myhandler;
-	caller2<bool, const char*, size_t> * rememberer;
+	NewIsChannelHandler myhandler;
+	caller2<bool, const char*, size_t> rememberer;
 	bool badchan;
 
  public:
-	ModuleChannelNames(InspIRCd* Me) : Module(Me)
+	ModuleChannelNames() : rememberer(ServerInstance->IsChannel)
 	{
-		rememberer = (caller2<bool, const char*, size_t> *) malloc(sizeof(caller2<bool, const char*, size_t>));
-		ServerInstance = Me;
-		*rememberer = ServerInstance->IsChannel;
-		myhandler = new NewIsChannelHandler(ServerInstance);
-		ServerInstance->IsChannel = myhandler;
+		ServerInstance->IsChannel = &myhandler;
 		badchan = false;
 		Implementation eventlist[] = { I_OnRehash, I_OnUserKick };
 		ServerInstance->Modules->Attach(eventlist, this, 2);
@@ -82,20 +76,19 @@ class ModuleChannelNames : public Module
 				modes.push_back(c->name);
 				modes.push_back("-P");
 
-				ServerInstance->SendMode(modes, ServerInstance->FakeClient);
-				ServerInstance->PI->SendMode(c->name, ServerInstance->Modes->GetLastParseParams(), ServerInstance->Modes->GetLastParseTranslate());
+				ServerInstance->SendGlobalMode(modes, ServerInstance->FakeClient);
 			}
 			const UserMembList* users = c->GetUsers();
 			for(UserMembCIter j = users->begin(); j != users->end(); ++j)
-				if (IS_LOCAL(j->first) && !c->ServerKickUser(j->first, "Channel name no longer valid", NULL))
-					delete c;
+				if (IS_LOCAL(j->first))
+					c->KickUser(ServerInstance->FakeClient, j->first, "Channel name no longer valid");
 		}
 		badchan = false;
 	}
 
 	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		std::string denyToken = Conf.ReadValue("channames", "denyrange", 0);
 		std::string allowToken = Conf.ReadValue("channames", "allowrange", 0);
 		memset(allowedmap, 1, sizeof(allowedmap));
@@ -110,9 +103,9 @@ class ModuleChannelNames : public Module
 		while (0 != (allowno = allowrange.GetToken()))
 			allowedmap[(unsigned char)(allowno)] = true;
 
-		allowedmap[7] = false;
-		allowedmap[' '] = false;
-		allowedmap[','] = false;
+		allowedmap[0x07] = false; // BEL
+		allowedmap[0x20] = false; // ' '
+		allowedmap[0x2C] = false; // ','
 
 		ValidateChans();
 	}
@@ -130,15 +123,13 @@ class ModuleChannelNames : public Module
 
 	virtual ~ModuleChannelNames()
 	{
-		delete myhandler;
-		ServerInstance->IsChannel = *rememberer;
-		free(rememberer);
+		ServerInstance->IsChannel = rememberer;
 		ValidateChans();
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$", VF_VENDOR,API_VERSION);
+		return Version("Implements config tags which allow changing characters allowed in channel names", VF_VENDOR);
 	}
 };