Release v3.8.0.

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index c4e55c3ca4db806fc31ab3afb1acdcc0b97ed85b..f8dcc8755e35c3c32b9e06a71b8f449111735f2d 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -1,7 +1,7 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2018-2020 Sadie Powell <sadie@witchery.services>
  *   Copyright (C) 2012-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
@@ -231,7 +231,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
                // Iterator to the first excess parameter
                const CommandBase::Params::iterator firstexcess = lastkeep + 1;
 
-               // Append all excess parameter(s) to the last parameter, seperated by spaces
+               // Append all excess parameter(s) to the last parameter, separated by spaces
                for (CommandBase::Params::const_iterator i = firstexcess; i != command_p.end(); ++i)
                {
                        lastkeep->push_back(' ');
@@ -243,7 +243,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        }
 
        /*
-        * We call OnPreCommand here seperately if the command exists, so the magic above can
+        * We call OnPreCommand here separately if the command exists, so the magic above can
         * truncate to max_params if necessary. -- w00t
         */
        ModResult MOD_RESULT;
@@ -283,9 +283,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if (command_p.size() < handler->min_params)
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
-               if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-                       user->WriteNumeric(RPL_SYNTAX, handler->name, handler->syntax);
+               handler->TellNotEnoughParameters(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
                return;
        }
@@ -293,7 +291,7 @@ void CommandParser::ProcessCommand(LocalUser* user, std::string& command, Comman
        if ((user->registered != REG_ALL) && (!handler->works_before_reg))
        {
                user->CommandFloodPenalty += failpenalty;
-               user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered");
+               handler->TellNotRegistered(user, command_p);
                FOREACH_MOD(OnCommandBlocked, (command, command_p, user));
        }
        else