Allow non-opers to use /MKPASSWD

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

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 36b3d712cfbcacd14cd09e2efa311cebff9251f5..7c18c8ab19cd8cb772bac95d3eddeecc479f34ca 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
@@ -69,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
         */
@@ -103,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;
@@ -120,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]);
@@ -145,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,
@@ -262,10 +262,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                command_p.push_back(token);
 
        std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-               
+
        /* find the command, check it exists */
        Commandtable::iterator cm = cmdlist.find(command);
-       
+
        if (cm == cmdlist.end())
        {
                int MOD_RESULT = 0;
@@ -310,7 +310,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                {
                        // BE CAREFUL: .end() returns past the end of the vector, hence decrement.
                        std::vector<std::string>::iterator it = --command_p.end();
-               
+
                        lparam.insert(0, " " + *(it));
                        command_p.erase(it); // remove last element
                }
@@ -525,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;
@@ -606,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)
@@ -679,5 +679,3 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 
        return translations;
 }
-
-