Apply patch from jmb, for bug #593. Snotices on override are now sent regardless...

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 0b2ea69c91ee069872590f3e3889b3c092c2c4fc..0f93e6f53d83e0ad9978d4b215f8f0ff11018a05 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -11,10 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDcommand_parse */
+/* $Core */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "xline.h"
 #include "socketengine.h"
 #include "socket.h"
@@ -148,7 +147,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
 bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -172,7 +171,7 @@ bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int
 
 Command* CommandParser::GetHandler(const std::string &commandname)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
        if (n != cmdlist.end())
                return n->second;
 
@@ -183,7 +182,7 @@ Command* CommandParser::GetHandler(const std::string &commandname)
 
 CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
 {
-       Commandable::iterator n = cmdlist.find(commandname);
+       Commandtable::iterator n = cmdlist.find(commandname);
 
        if (n != cmdlist.end())
        {
@@ -285,13 +284,13 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        }
 
        /* find the command, check it exists */
-       Commandable::iterator cm = cmdlist.find(command);
+       Commandtable::iterator cm = cmdlist.find(command);
        
        if (cm == cmdlist.end())
        {
                if (user->registered == REG_ALL)
                {
-                       user->WriteNumeric(421, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
                }
                ServerInstance->stats->statsUnknown++;
                return true;
@@ -315,33 +314,42 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        {
                if (!user->IsModeSet(cm->second->flags_needed))
                {
-                       user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
                        return do_more;
                }
                if (!user->HasPermission(command))
                {
-                       user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str());
+                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str());
                        return do_more;
                }
        }
        if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
        {
                /* command is disabled! */
-               user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick.c_str(),command.c_str());
+               if (ServerInstance->Config->DisabledDontExist)
+               {
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+               }
+               else
+               {
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.",
+                                                                               user->nick.c_str(), command.c_str());
+               }
+
                ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
                                command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
        if (command_p.size() < cm->second->min_params)
        {
-               user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
+               user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
                if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
-                       user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str());
+                       user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str());
                return do_more;
        }
        if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
        {
-               user->WriteNumeric(451, "%s :You have not registered",command.c_str());
+               user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str());
                return do_more;
        }
        else
@@ -368,7 +376,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 
 void CommandParser::RemoveCommands(const char* source)
 {
-       Commandable::iterator i,safei;
+       Commandtable::iterator i,safei;
        for (i = cmdlist.begin(); i != cmdlist.end();)
        {
                safei = i;
@@ -377,7 +385,7 @@ void CommandParser::RemoveCommands(const char* source)
        }
 }
 
-void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
+void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
 {
        Command* x = safei->second;
        if (x->source == std::string(source))
@@ -545,7 +553,7 @@ void CommandParser::SetupCommandTable(User* user)
                dirent* entry = NULL;
                while (0 != (entry = readdir(library)))
                {
-                       if (match(entry->d_name, "cmd_*.so"))
+                       if (InspIRCd::Match(entry->d_name, "cmd_*.so"))
                        {
                                if (!user)
                                {