X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=48d8cc8710b47529d18e304d14b56da06e0dc450;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=7e9c5fd48f6e6dbaaf586d74559308dbe91c4d75;hpb=0b3a4371c504c45c8a4504d114efb2ca674374e0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 7e9c5fd48..48d8cc871 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,23 +21,22 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
+#include "modules/cap.h"
 
 /* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
- public:
 	GenericCap cap;
+ public:
 	ModuleNamesX() : cap(this, "multi-prefix")
 	{
-		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
-
-	~ModuleNamesX()
+	void init()
 	{
+		Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	Version GetVersion()
@@ -45,20 +44,19 @@ class ModuleNamesX : public Module
 		return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR);
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		output.append(" NAMESX");
+		tokens["NAMESX"];
 	}
 
 	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
-		irc::string c = command.c_str();
 		/* We don't actually create a proper command handler class for PROTOCTL,
 		 * because other modules might want to have PROTOCTL hooks too.
 		 * Therefore, we just hook its as an unvalidated command therefore we
 		 * can capture it even if it doesnt exist! :-)
 		 */
-		if (c == "PROTOCTL")
+		if (command == "PROTOCTL")
 		{
 			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
 			{
@@ -106,7 +104,7 @@ class ModuleNamesX : public Module
 
 		// Try to find this channel
 		std::string channame = line.substr(a, b-a);
-		Channel* chan = ServerInstance->FindChan(channame.c_str());
+		Channel* chan = ServerInstance->FindChan(channame);
 		if (!chan)
 			return;