X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=794cd5b46b4b6b07a1df73a994abfb62beb34425;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=3ce1b00eb10c5fc80a60a6adcb75d8b05e582b69;hpb=9855300460b2e695b44646897811cc3f28428fa0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 3ce1b00eb..794cd5b46 100644
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -14,14 +14,12 @@
 #include "inspircd.h"
 #include "m_cap.h"
 
-static const char* dummy = "ON";
-
-/* $ModDesc: Provides aliases of commands. */
+/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */
 
 class ModuleNamesX : public Module
 {
  public:
-	
+
 	ModuleNamesX(InspIRCd* Me)
 		: Module(Me)
 	{
@@ -42,7 +40,7 @@ class ModuleNamesX : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
 
 	virtual void On005Numeric(std::string &output)
@@ -50,7 +48,7 @@ class ModuleNamesX : public Module
 		output.append(" NAMESX");
 	}
 
-	virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
+	virtual int OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *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,
@@ -60,9 +58,9 @@ class ModuleNamesX : public Module
 		 */
 		if (c == "PROTOCTL")
 		{
-			if ((pcnt) && (!strcasecmp(parameters[0],"NAMESX")))
+			if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
 			{
-				user->Extend("NAMESX",dummy);
+				user->Extend("NAMESX");
 				return 1;
 			}
 		}
@@ -83,40 +81,7 @@ class ModuleNamesX : public Module
 
 	virtual void OnEvent(Event *ev)
 	{
-		if (ev->GetEventID() == "cap_req")
-		{
-			CapData *data = (CapData *) ev->GetData();
-
-			std::vector<std::string>::iterator it;
-			if ((it = std::find(data->wanted.begin(), data->wanted.end(), "multi-prefix")) != data->wanted.end())
-			{
-				// we can handle this, so ACK it, and remove it from the wanted list
-				data->ack.push_back(*it);
-				data->wanted.erase(it);
-				data->user->Extend("NAMESX",dummy);
-			}
-		}
-
-		if (ev->GetEventID() == "cap_ls")
-		{
-			CapData *data = (CapData *) ev->GetData();
-			data->wanted.push_back("multi-prefix");
-		}
-
-		if (ev->GetEventID() == "cap_list")
-		{
-			CapData *data = (CapData *) ev->GetData();
-
-			if (data->user->GetExt("NAMESX"))
-				data->wanted.push_back("multi-prefix");
-		}
-
-		if (ev->GetEventID() == "cap_clear")
-		{
-			CapData *data = (CapData *) ev->GetData();
-			data->ack.push_back("-multi-prefix");
-			data->user->Shrink("NAMESX");
-		}
+		GenericCapHandler(ev, "NAMESX", "multi-prefix");
 	}
 };