X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_cap.cpp;h=b8abd1b02116d0d5a2e2307ec772ac7953bd460b;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=f69df02be7d95ca18fb89e13d5a6c4d711fc7750;hpb=e1834aa932f9c8cdddcb7b186bf0390e4d9c7d28;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index f69df02be..b8abd1b02 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -20,11 +20,11 @@
 CAP LS
 :alfred.staticbox.net CAP * LS :multi-prefix sasl
 CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix 
+:alfred.staticbox.net CAP * ACK :multi-prefix
 CAP CLEAR
 :alfred.staticbox.net CAP * ACK :-multi-prefix
 CAP REQ :multi-prefix
-:alfred.staticbox.net CAP * ACK :multi-prefix 
+:alfred.staticbox.net CAP * ACK :multi-prefix
 CAP LIST
 :alfred.staticbox.net CAP * LIST :multi-prefix
 CAP END
@@ -41,9 +41,9 @@ class CommandCAP : public Command
 		this->source = "m_cap.so";
 	}
 
-	CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		irc::string subcommand = parameters[0];
+		irc::string subcommand = parameters[0].c_str();
 
 		if (subcommand == "REQ")
 		{
@@ -53,7 +53,7 @@ class CommandCAP : public Command
 			Data.user = user;
 			Data.creator = this->Creator;
 
-			if (pcnt < 2)
+			if (parameters.size() < 2)
 				return CMD_FAILURE;
 
 			// tokenize the input into a nice list of requested caps
@@ -76,9 +76,9 @@ class CommandCAP : public Command
 				user->WriteServ("CAP * ACK :%s", AckResult.c_str());
 			}
 
-			if (Data.nak.size() > 0)
+			if (Data.wanted.size() > 0)
 			{
-				std::string NakResult = irc::stringjoiner(" ", Data.nak, 0, Data.nak.size() - 1).GetJoined();
+				std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
 				user->WriteServ("CAP * NAK :%s", NakResult.c_str());
 			}
 		}
@@ -123,7 +123,7 @@ class CommandCAP : public Command
 		}
 		else
 		{
-			user->WriteServ("410 * %s :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -160,7 +160,7 @@ class ModuleCAP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };