Allow forward linking compatability by accepting higher protocol version numbers...

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index d0b1148165815f494225d1dcff3986643876f7d6..bf025be7ce5c4f505c1b3b31138edeff382175f3 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -266,6 +266,16 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        /* find the command, check it exists */
        Commandtable::iterator cm = cmdlist.find(command);
 
+       /* Modify the user's penalty regardless of whether or not the command exists */
+       bool do_more = true;
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
+       {
+               // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
+               user->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2);
+               do_more = (user->Penalty < 10);
+       }
+
+
        if (cm == cmdlist.end())
        {
                int MOD_RESULT = 0;
@@ -336,14 +346,6 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
        if (MOD_RESULT == 1)
                return true;
 
-       /* Modify the user's penalty */
-       bool do_more = true;
-       if (!user->HasPrivPermission("users/flood/no-throttle"))
-       {
-               user->IncreasePenalty(cm->second->Penalty);
-               do_more = (user->Penalty < 10);
-       }
-
        /* activity resets the ping pending timer */
        if (user->MyClass)
                user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
@@ -374,7 +376,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                                                                                user->nick.c_str(), command.c_str());
                }
 
-               ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+               ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)",
                                command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
                return do_more;
        }
@@ -506,23 +508,20 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
                cmdlist.erase(cmdlist.find(cmd));
 
                RFCCommands.erase(cmd);
-               std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
                delete cmdptr;
                dlclose(command->second);
-
-               snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
-               const char* err = this->LoadCommand(filename);
-               if (err)
-               {
-                       if (user)
-                               user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick.c_str(), cmd.c_str(), err);
-                       return false;
-               }
-
-               return true;
        }
 
-       return false;
+       std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
+       snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
+       const char* err = this->LoadCommand(filename);
+       if (err)
+       {
+               if (user)
+                       user->WriteServ("NOTICE %s :*** Error loading '%s': %s", user->nick.c_str(), filename, err);
+               return false;
+       }
+       return true;
 }
 
 CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
@@ -534,12 +533,12 @@ CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User
        if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
        {
                user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
-               ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
+               ServerInstance->SNO->WriteToSnoMask('a', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
                return CMD_SUCCESS;
        }
        else
        {
-               user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
+               user->WriteServ("NOTICE %s :*** Could not reload command '%s'. The command will not work until reloaded successfully.", user->nick.c_str(), parameters[0].c_str());
                return CMD_FAILURE;
        }
 }
@@ -609,19 +608,20 @@ void CommandParser::SetupCommandTable()
                this->CreateCommand(new CommandReload(ServerInstance));
 }
 
-int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::string &source, std::string &dest)
+int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
 {
-       irc::spacesepstream items(source);
-       std::vector<TranslateType>::const_iterator types = to.begin();
+       std::deque<std::string>::const_iterator items = source.begin();
+       std::deque<TranslateType>::const_iterator types = to.begin();
        User* user = NULL;
-       std::string item;
        int translations = 0;
        dest.clear();
 
-       while (items.GetToken(item))
+       while (items != source.end() && types != to.end())
        {
                TranslateType t = *types;
+               std::string item = *items;
                types++;
+               items++;
 
                switch (t)
                {