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

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index df11f1d32..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,23 +41,46 @@ 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")
 		{
 			CapData Data;
-			Data.type = parameters[1];
+
+			Data.type = subcommand;
 			Data.user = user;
 			Data.creator = this->Creator;
-			Data.parameter = (pcnt > 1 ? parameters[1] : "");
+
+			if (parameters.size() < 2)
+				return CMD_FAILURE;
+
+			// tokenize the input into a nice list of requested caps
+			std::string param = parameters[1];
+			std::string cap_;
+			irc::spacesepstream cap_stream(param);
+
+			while (cap_stream.GetToken(cap_))
+			{
+				Data.wanted.push_back(cap_);
+			}
 
 			user->Extend("CAP_REGHOLD");
 			Event event((char*) &Data, (Module*)this->Creator, "cap_req");
 			event.Send(this->ServerInstance);
 
-			user->WriteServ("CAP * ACK :%s", Data.parameter.c_str());
+			if (Data.ack.size() > 0)
+			{
+				std::string AckResult = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+				user->WriteServ("CAP * ACK :%s", AckResult.c_str());
+			}
+
+			if (Data.wanted.size() > 0)
+			{
+				std::string NakResult = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+				user->WriteServ("CAP * NAK :%s", NakResult.c_str());
+			}
 		}
 		else if (subcommand == "END")
 		{
@@ -70,13 +93,18 @@ class CommandCAP : public Command
 			Data.type = subcommand;
 			Data.user = user;
 			Data.creator = this->Creator;
-			Data.parameter.clear();
 
 			user->Extend("CAP_REGHOLD");
 			Event event((char*) &Data, (Module*)this->Creator, subcommand == "LS" ? "cap_ls" : "cap_list");
 			event.Send(this->ServerInstance);
 
-			user->WriteServ("CAP * LS :%s", Data.parameter.c_str());
+			std::string Result;
+			if (Data.wanted.size() > 0)
+				Result = irc::stringjoiner(" ", Data.wanted, 0, Data.wanted.size() - 1).GetJoined();
+			else
+				Result = "";
+
+			user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
 		}
 		else if (subcommand == "CLEAR")
 		{
@@ -85,17 +113,17 @@ class CommandCAP : public Command
 			Data.type = subcommand;
 			Data.user = user;
 			Data.creator = this->Creator;
-			Data.parameter.clear();
 
 			user->Extend("CAP_REGHOLD");
 			Event event((char*) &Data, (Module*)this->Creator, "cap_clear");
 			event.Send(this->ServerInstance);
 
-			user->WriteServ("CAP * ACK :%s", Data.parameter.c_str());
+			std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
+			user->WriteServ("CAP * ACK :%s", Result.c_str());
 		}
 		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;
@@ -113,17 +141,17 @@ class ModuleCAP : public Module
 		newcommand = new CommandCAP(ServerInstance, this);
 		ServerInstance->AddCommand(newcommand);
 
-		Implementation eventlist[] = { I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect, I_OnRequest };
-		ServerInstance->Modules->Attach(eventlist, this, 5);
+		Implementation eventlist[] = { I_OnCheckReady };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
 	virtual bool OnCheckReady(User* user)
 	{
 		/* Users in CAP state get held until CAP END */
 		if (user->GetExt("CAP_REGHOLD"))
-			return true;
+			return false;
 
-		return false;
+		return true;
 	}
 
 	virtual ~ModuleCAP()
@@ -132,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);
 	}
 };