Make xline expiry messages a bit clearer that the xline may have expired a while...

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index e6b38242caddc191b2e020bbcf00f8f12a34b46d..9ea7b020229569b13fd46358effdefbac880ebf1 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -30,11 +30,21 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st
 {
        int MOD_RESULT = 0;
        FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
+
+       /* Module matched */
        if (MOD_RESULT == 1)
                return 0;
+
+       /* Module explicitly didnt match */
        if (MOD_RESULT == -1)
                return 1;
-       return data != input; // this seems back to front, but returns 0 if they *match*, 1 else
+
+       /* We dont handle any hash types except for plaintext - Thanks tra26 */
+       if (hashtype != "" && hashtype != "plaintext")
+               /* See below. 1 because they dont match */
+               return 1;
+
+       return (data != input); // this seems back to front, but returns 0 if they *match*, 1 else
 }
 
 /* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
@@ -59,10 +69,10 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
                return 0;
 
        /** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
-        * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+        * By using std::set (thanks for the idea w00t) we can cut this down a ton.
         * ...VOOODOOOO!
         */
-       std::map<irc::string, bool> dupes;
+       std::set<irc::string> dupes;
 
        /* Create two lists, one for channel names, one for keys
         */
@@ -93,7 +103,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
 
                        CommandObj->Handle(new_parameters, user);
 
-                       dupes[item.c_str()] = true;
+                       dupes.insert(item.c_str());
                }
        }
        return 1;
@@ -110,7 +120,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
        if (parameters[splithere].find(',') == std::string::npos)
                return 0;
 
-       std::map<irc::string, bool> dupes;
+       std::set<irc::string> dupes;
 
        /* Only one commasepstream here */
        irc::commasepstream items1(parameters[splithere]);
@@ -135,7 +145,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<s
                        /* Execute the command handler. */
                        CommandObj->Handle(new_parameters, user);
 
-                       dupes[item.c_str()] = true;
+                       dupes.insert(item.c_str());
                }
        }
        /* By returning 1 we tell our caller that nothing is to be done,
@@ -218,32 +228,8 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std::
 
 void CommandParser::DoLines(User* current, bool one_only)
 {
-       // while there are complete lines to process...
-       unsigned int floodlines = 0;
-
        while (current->BufferIsReady())
        {
-               if (current->MyClass)
-               {
-                       if (ServerInstance->Time() > current->reset_due)
-                       {
-                               current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold();
-                               current->lines_in = 0;
-                       }
-
-                       if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood())
-                       {
-                               ServerInstance->FloodQuitUser(current);
-                               return;
-                       }
-
-                       if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0))
-                       {
-                               ServerInstance->FloodQuitUser(current);
-                               return;
-                       }
-               }
-
                // use GetBuffer to copy single lines into the sanitized string
                std::string single_line = current->GetBuffer();
                current->bytes_in += single_line.length();
@@ -352,12 +338,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
 
        /* Modify the user's penalty */
        bool do_more = true;
-       if (!user->ExemptFromPenalty)
+       if (!user->HasPrivPermission("users/flood/no-throttle"))
        {
                user->IncreasePenalty(cm->second->Penalty);
                do_more = (user->Penalty < 10);
-               if (!do_more)
-                       user->OverPenalty = true;
        }
 
        /* activity resets the ping pending timer */
@@ -541,7 +525,7 @@ bool CommandParser::ReloadCommand(std::string cmd, User* user)
        return false;
 }
 
-CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *user)
+CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
 {
        if (parameters.size() < 1)
                return CMD_FAILURE;
@@ -604,7 +588,7 @@ void CommandParser::SetupCommandTable()
                dirent* entry = NULL;
                while (0 != (entry = readdir(library)))
                {
-                       if (InspIRCd::Match(entry->d_name, "cmd_*.so"))
+                       if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
                        {
                                printf(".");
                                fflush(stdout);
@@ -622,7 +606,7 @@ void CommandParser::SetupCommandTable()
        }
 
        if (cmdlist.find("RELOAD") == cmdlist.end())
-               this->CreateCommand(new cmd_reload(ServerInstance));
+               this->CreateCommand(new CommandReload(ServerInstance));
 }
 
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)