Increase the size of the matrix for map drawing to 250x250

[user/henk/code/inspircd.git] / src / modules / m_cap.cpp

diff --git a/src/modules/m_cap.cpp b/src/modules/m_cap.cpp
index 63d1d685f841dae9fc329504b5d91854f85fd707..b56300ba803ca98e763f00aafd260532547092a6 100644 (file)
--- a/src/modules/m_cap.cpp
+++ b/src/modules/m_cap.cpp
@@ -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,13 @@ 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];
+               /* Ignore CAP from registered clients */
+               if (user->registered == REG_ALL)
+                       return CMD_FAILURE;
+
+               irc::string subcommand = parameters[0].c_str();
 
                if (subcommand == "REQ")
                {
@@ -53,7 +57,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
@@ -123,7 +127,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;