X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=605423ae049f0bf8c0472965c4caefee386b8db2;hb=ad47ea662698e72ff8f79b03512b1e7fe81bdf53;hp=dbd81ed5395585156f0e2729d82ccc9468db2711;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index dbd81ed53..605423ae0 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -1,20 +1,25 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
  *
- * ---------------------------------------------------
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "m_cap.h"
 
-/* $ModDesc: Provides the CAP negotiation mechanism seen in ratbox-derived ircds */
+#include "inspircd.h"
+#include "modules/cap.h"
 
 /*
 CAP LS
@@ -48,39 +53,34 @@ class CommandCAP : public Command
 
 		if (subcommand == "REQ")
 		{
-			CapData Data;
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
-
 			if (parameters.size() < 2)
 				return CMD_FAILURE;
 
+			CapEvent Data(creator, user, CapEvent::CAPEVENT_REQ);
+
 			// tokenize the input into a nice list of requested caps
-			std::string param = parameters[1];
 			std::string cap_;
-			irc::spacesepstream cap_stream(param);
+			irc::spacesepstream cap_stream(parameters[1]);
 
 			while (cap_stream.GetToken(cap_))
 			{
+				std::transform(cap_.begin(), cap_.end(), cap_.begin(), ::tolower);
 				Data.wanted.push_back(cap_);
 			}
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, "cap_req");
-			event.Send();
+			Data.Send();
 
 			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());
+				std::string AckResult = irc::stringjoiner(Data.ack).GetJoined();
+				user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), 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());
+				std::string NakResult = irc::stringjoiner(Data.wanted).GetJoined();
+				user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str());
 			}
 		}
 		else if (subcommand == "END")
@@ -89,45 +89,31 @@ class CommandCAP : public Command
 		}
 		else if ((subcommand == "LS") || (subcommand == "LIST"))
 		{
-			CapData Data;
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
+			CapEvent Data(creator, user, subcommand == "LS" ? CapEvent::CAPEVENT_LS : CapEvent::CAPEVENT_LIST);
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, subcommand == "LS" ? "cap_ls" : "cap_list");
-			event.Send();
+			Data.Send();
 
-			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());
+			std::string Result = irc::stringjoiner(Data.wanted).GetJoined();
+			user->WriteServ("CAP %s %s :%s", user->nick.c_str(), subcommand.c_str(), Result.c_str());
 		}
 		else if (subcommand == "CLEAR")
 		{
-			CapData Data;
-
-			Data.type = subcommand;
-			Data.user = user;
-			Data.creator = this->creator;
+			CapEvent Data(creator, user, CapEvent::CAPEVENT_CLEAR);
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, "cap_clear");
-			event.Send();
+			Data.Send();
 
-			std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
-			user->WriteServ("CAP * ACK :%s", Result.c_str());
+			std::string Result = irc::stringjoiner(Data.ack).GetJoined();
+			user->WriteServ("CAP %s ACK :%s", user->nick.c_str(), Result.c_str());
 		}
 		else
 		{
-			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "%s :Invalid CAP subcommand", subcommand.c_str());
+			return CMD_FAILURE;
 		}
 
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
 };
 
@@ -138,14 +124,9 @@ class ModuleCAP : public Module
 	ModuleCAP()
 		: cmd(this)
 	{
-		ServerInstance->AddCommand(&cmd);
-		Extensible::Register(&cmd.reghold);
-
-		Implementation eventlist[] = { I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	ModResult OnCheckReady(User* user)
+	ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
 	{
 		/* Users in CAP state get held until CAP END */
 		if (cmd.reghold.get(user))
@@ -154,15 +135,10 @@ class ModuleCAP : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	~ModuleCAP()
-	{
-	}
-
-	Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Client CAP extension support", VF_VENDOR);
 	}
 };
 
 MODULE_INIT(ModuleCAP)
-