ProtocolInterface::SendEncapsulatedData() changes

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 08e28557ce871f5f6c2bbc5a55bb384bbe99ff48..66b8dcd670294b5b09803211f0623de7c2b46c9c 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -23,25 +23,24 @@
 
 #include "inspircd.h"
 
-int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
+bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype)
 {
        ModResult res;
        FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
 
        /* Module matched */
        if (res == MOD_RES_ALLOW)
-               return 0;
+               return true;
 
        /* Module explicitly didnt match */
        if (res == MOD_RES_DENY)
-               return 1;
+               return false;
 
        /* We dont handle any hash types except for plaintext - Thanks tra26 */
        if (!hashtype.empty() && hashtype != "plaintext")
-               /* See below. 1 because they dont match */
-               return 1;
+               return false;
 
-       return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else
+       return (data == input);
 }
 
 bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std::string>& parameters, unsigned int splithere, int extra, bool usemax)
@@ -100,7 +99,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std
                                // Run the OnPostCommand hook with the last parameter (original line) being empty
                                // to indicate that the command had more targets in its original form.
                                item.clear();
-                               FOREACH_MOD(I_OnPostCommand, OnPostCommand(handler, new_parameters, localuser, result, item));
+                               FOREACH_MOD(OnPostCommand, (handler, new_parameters, localuser, result, item));
                        }
                }
        }
@@ -108,30 +107,6 @@ bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std
        return true;
 }
 
-bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
-{
-       Commandtable::iterator n = cmdlist.find(commandname);
-
-       if (n != cmdlist.end())
-       {
-               if ((pcnt >= n->second->min_params))
-               {
-                       if (IS_LOCAL(user) && n->second->flags_needed)
-                       {
-                               if (user->IsModeSet(n->second->flags_needed))
-                               {
-                                       return (user->HasPermission(commandname));
-                               }
-                       }
-                       else
-                       {
-                               return true;
-                       }
-               }
-       }
-       return false;
-}
-
 Command* CommandParser::GetHandler(const std::string &commandname)
 {
        Commandtable::iterator n = cmdlist.find(commandname);
@@ -230,7 +205,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                if (!handler)
                {
                        if (user->registered == REG_ALL)
-                               user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+                               user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command",command.c_str());
                        ServerInstance->stats->statsUnknown++;
                        return;
                }
@@ -280,14 +255,14 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
        {
                if (!user->IsModeSet(handler->flags_needed))
                {
-                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+                       user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - You do not have the required operator privileges");
                        return;
                }
 
                if (!user->HasPermission(command))
                {
-                       user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
-                               user->nick.c_str(), user->oper->name.c_str(), command.c_str());
+                       user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - Oper type %s does not have access to command %s",
+                               user->oper->name.c_str(), command.c_str());
                        return;
                }
        }
@@ -297,12 +272,11 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                /* command is disabled! */
                if (ServerInstance->Config->DisabledDontExist)
                {
-                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command", command.c_str());
                }
                else
                {
-                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :This command has been disabled.",
-                                                                               user->nick.c_str(), command.c_str());
+                       user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", command.c_str());
                }
 
                ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)",
@@ -315,9 +289,9 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 
        if (command_p.size() < handler->min_params)
        {
-               user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
+               user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s :Not enough parameters.", command.c_str());
                if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
-                       user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), handler->name.c_str(), handler->syntax.c_str());
+                       user->WriteNumeric(RPL_SYNTAX, ":SYNTAX %s %s", handler->name.c_str(), handler->syntax.c_str());
                return;
        }
 
@@ -340,7 +314,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
                 */
                CmdResult result = handler->Handle(command_p, user);
 
-               FOREACH_MOD(I_OnPostCommand, OnPostCommand(handler, command_p, user, result, cmd));
+               FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, cmd));
        }
 }
 
@@ -351,6 +325,10 @@ void CommandParser::RemoveCommand(Command* x)
                cmdlist.erase(n);
 }
 
+CommandBase::~CommandBase()
+{
+}
+
 Command::~Command()
 {
        ServerInstance->Parser->RemoveCommand(this);
@@ -358,7 +336,7 @@ Command::~Command()
 
 void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
 {
-       if (!user || buffer.empty())
+       if (buffer.empty())
                return;
 
        ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
@@ -381,7 +359,7 @@ CommandParser::CommandParser()
 {
 }
 
-std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final, Command* custom_translator)
+std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final, CommandBase* custom_translator)
 {
        std::vector<TranslateType>::const_iterator types = to.begin();
        std::string dest;
@@ -410,7 +388,7 @@ std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, c
        return dest;
 }
 
-void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, Command* custom_translator, unsigned int paramnumber)
+void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator, unsigned int paramnumber)
 {
        switch (to)
        {
@@ -435,7 +413,6 @@ void CommandParser::TranslateSingleParam(TranslateType to, const std::string& it
                        }
                        // If no custom translator was given, fall through
                }
-               case TR_END:
                case TR_TEXT:
                default:
                        /* Do nothing */