X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cap.cpp;h=2e9a24811cbdd152c31a22bc83bf9c805c62de99;hb=219993bc9018d9f0d9568330d7a972b68b785d27;hp=2849444b408a98302349cfa1b81e2667f8340942;hpb=b3ffc4752f70546b8211d5d0f1b31f7b46906eab;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 2849444b4..2e9a24811 100644
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.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.
@@ -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
@@ -43,10 +43,6 @@ class CommandCAP : public Command
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
-		/* Ignore CAP from registered clients */
-		if (user->registered == REG_ALL)
-			return CMD_FAILURE;
-
 		irc::string subcommand = parameters[0].c_str();
 
 		if (subcommand == "REQ")
@@ -127,7 +123,7 @@ class CommandCAP : public Command
 		}
 		else
 		{
-			user->WriteNumeric(410, "* %s :Invalid CAP subcommand", subcommand.c_str());
+			user->WriteNumeric(ERR_INVALIDCAPSUBCOMMAND, "* %s :Invalid CAP subcommand", subcommand.c_str());
 		}
 
 		return CMD_FAILURE;
@@ -136,14 +132,12 @@ class CommandCAP : public Command
 
 class ModuleCAP : public Module
 {
-	CommandCAP* newcommand;
+	CommandCAP newcommand;
  public:
 	ModuleCAP(InspIRCd* Me)
-		: Module(Me)
+		: Module(Me), newcommand(Me, this)
 	{
-		// Create a new command
-		newcommand = new CommandCAP(ServerInstance, this);
-		ServerInstance->AddCommand(newcommand);
+		ServerInstance->AddCommand(&newcommand);
 
 		Implementation eventlist[] = { I_OnCheckReady };
 		ServerInstance->Modules->Attach(eventlist, this, 1);
@@ -164,7 +158,7 @@ class ModuleCAP : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 2, 0, 0, VF_VENDOR, API_VERSION);
+		return Version("$Id$", VF_VENDOR, API_VERSION);
 	}
 };