Also use freenode's 470 numeric in m_banredirect.

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 3373f714f6330e566f52081f439388a89c44caa6..36b3d712cfbcacd14cd09e2efa311cebff9251f5 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -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.
@@ -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 */
@@ -591,21 +575,12 @@ const char* CommandParser::LoadCommand(const char* name)
        return NULL;
 }
 
-void CommandParser::SetupCommandTable(User* user)
+/** This is only invoked on startup
+ */
+void CommandParser::SetupCommandTable()
 {
-       for (SharedObjectList::iterator command = RFCCommands.begin(); command != RFCCommands.end(); command++)
-       {
-               Command *cmdptr = cmdlist.find(command->first)->second;
-               cmdlist.erase(cmdlist.find(command->first));
-               RFCCommands.erase(command);
-               delete cmdptr;
-       }
-
-       if (!user)
-       {
-               printf("\nLoading core commands");
-               fflush(stdout);
-       }
+       printf("\nLoading core commands");
+       fflush(stdout);
 
        DIR* library = opendir(LIBRARYDIR);
        if (library)
@@ -613,31 +588,21 @@ void CommandParser::SetupCommandTable(User* user)
                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))
                        {
-                               if (!user)
-                               {
-                                       printf(".");
-                                       fflush(stdout);
-                               }
+                               printf(".");
+                               fflush(stdout);
+
                                const char* err = this->LoadCommand(entry->d_name);
                                if (err)
                                {
-                                       if (user)
-                                       {
-                                               user->WriteServ("NOTICE %s :*** Failed to load core command %s: %s", user->nick.c_str(), entry->d_name, err);
-                                       }
-                                       else
-                                       {
-                                               printf("Error loading %s: %s", entry->d_name, err);
-                                               exit(EXIT_STATUS_BADHANDLER);
-                                       }
+                                       printf("Error loading %s: %s", entry->d_name, err);
+                                       exit(EXIT_STATUS_BADHANDLER);
                                }
                        }
                }
                closedir(library);
-               if (!user)
-                       printf("\n");
+               printf("\n");
        }
 
        if (cmdlist.find("RELOAD") == cmdlist.end())