X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=acfddaaf29899b0c1c9bffcac024a7e27bb68d9c;hb=cb4c516ace8fef75b8a54a141c3644af9697ac0a;hp=160c7a9c92105903a119f7f054be018cbdf088ad;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 160c7a9c9..acfddaaf2 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -36,9 +36,10 @@ class CommandCAP : public Command
 {
  public:
 	LocalIntExt reghold;
-	CommandCAP (InspIRCd* Instance, Module* mod) : Command(Instance, mod, "CAP", 0, 1, true),
+	CommandCAP (Module* mod) : Command(mod, "CAP", 1),
 		reghold("CAP_REGHOLD", mod)
 	{
+		works_before_reg = true;
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -47,7 +48,7 @@ class CommandCAP : public Command
 
 		if (subcommand == "REQ")
 		{
-			CapData Data;
+			CapEvent Data(creator, "cap_req");
 
 			Data.type = subcommand;
 			Data.user = user;
@@ -67,19 +68,18 @@ class CommandCAP : public Command
 			}
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, "cap_req");
-			event.Send(this->ServerInstance);
+			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());
+				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());
+				user->WriteServ("CAP %s NAK :%s", user->nick.c_str(), NakResult.c_str());
 			}
 		}
 		else if (subcommand == "END")
@@ -88,15 +88,14 @@ class CommandCAP : public Command
 		}
 		else if ((subcommand == "LS") || (subcommand == "LIST"))
 		{
-			CapData Data;
+			CapEvent Data(creator, subcommand == "LS" ? "cap_ls" : "cap_list");
 
 			Data.type = subcommand;
 			Data.user = user;
 			Data.creator = this->creator;
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, subcommand == "LS" ? "cap_ls" : "cap_list");
-			event.Send(this->ServerInstance);
+			Data.Send();
 
 			std::string Result;
 			if (Data.wanted.size() > 0)
@@ -104,26 +103,25 @@ class CommandCAP : public Command
 			else
 				Result = "";
 
-			user->WriteServ("CAP * %s :%s", subcommand.c_str(), Result.c_str());
+			user->WriteServ("CAP %s %s :%s", user->nick.c_str(), subcommand.c_str(), Result.c_str());
 		}
 		else if (subcommand == "CLEAR")
 		{
-			CapData Data;
+			CapEvent Data(creator, "cap_clear");
 
 			Data.type = subcommand;
 			Data.user = user;
 			Data.creator = this->creator;
 
 			reghold.set(user, 1);
-			Event event((char*) &Data, this->creator, "cap_clear");
-			event.Send(this->ServerInstance);
+			Data.Send();
 
 			std::string Result = irc::stringjoiner(" ", Data.ack, 0, Data.ack.size() - 1).GetJoined();
-			user->WriteServ("CAP * ACK :%s", Result.c_str());
+			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 %s :Invalid CAP subcommand", user->nick.c_str(), subcommand.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -134,17 +132,17 @@ class ModuleCAP : public Module
 {
 	CommandCAP cmd;
  public:
-	ModuleCAP(InspIRCd* Me)
-		: Module(Me), cmd(Me, this)
+	ModuleCAP()
+		: cmd(this)
 	{
 		ServerInstance->AddCommand(&cmd);
-		Extensible::Register(&cmd.reghold);
+		ServerInstance->Extensions.Register(&cmd.reghold);
 
 		Implementation eventlist[] = { I_OnCheckReady };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	ModResult OnCheckReady(User* user)
+	ModResult OnCheckReady(LocalUser* user)
 	{
 		/* Users in CAP state get held until CAP END */
 		if (cmd.reghold.get(user))