X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=2e206003271838f2398479e0ef55c87be0ed08ae;hb=3fef0ed889eecb40b96a597924254560c81d4a09;hp=2603b0ce5b5bbd0d04779d2e1299b25c5e704cf7;hpb=f960a97cc6b509c756a20d892609825c67c2fc43;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 2603b0ce5..2e2060032 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -21,44 +21,34 @@
 
 
 #include "inspircd.h"
-#include "m_cap.h"
-
-/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
+#include "modules/cap.h"
 
 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()
 	{
 	}
 
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		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) CXX11_OVERRIDE
 	{
-		output.append(" NAMESX");
+		tokens["NAMESX"];
 	}
 
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
+	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
 	{
-		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")))
 			{
@@ -69,7 +59,7 @@ class ModuleNamesX : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick)
+	void OnNamesListItem(User* issuer, Membership* memb, std::string &prefixes, std::string &nick) CXX11_OVERRIDE
 	{
 		if (!cap.ext.get(issuer))
 			return;
@@ -81,31 +71,24 @@ class ModuleNamesX : public Module
 		prefixes = memb->chan->GetAllPrefixChars(memb->user);
 	}
 
-	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
+	void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Channel* chan, std::string& line) CXX11_OVERRIDE
 	{
-		if (!cap.ext.get(source) || line.empty())
+		if ((!chan) || (!cap.ext.get(source)))
 			return;
 
-		std::string::size_type pos = line.find(':');
-		if (pos == std::string::npos || pos < 2)
+		// Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
+		// only ever valid after whitespace, so... find the actual delimiter first!
+		// Thanks to FxChiP for pointing this out.
+		std::string::size_type pos = line.find(" :");
+		if (pos == std::string::npos || pos == 0)
 			return;
-		pos -= 2;
+		pos--;
 		// Don't do anything if the user has no prefixes
 		if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
 			return;
 
 		// 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a
-		//              a     b                                       pos
-		std::string::size_type a = 4 + source->nick.length() + 1;
-		std::string::size_type b = line.find(' ', a);
-		if (b == std::string::npos)
-			return;
-
-		// Try to find this channel
-		std::string channame = line.substr(a, b-a);
-		Channel* chan = ServerInstance->FindChan(channame.c_str());
-		if (!chan)
-			return;
+		//                                                            pos
 
 		// Don't do anything if the user has only one prefix
 		std::string prefixes = chan->GetAllPrefixChars(user);
@@ -116,7 +99,7 @@ class ModuleNamesX : public Module
 		line.insert(pos, prefixes);
 	}
 
-	void OnEvent(Event& ev)
+	void OnEvent(Event& ev) CXX11_OVERRIDE
 	{
 		cap.HandleEvent(ev);
 	}