X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=ec5ebba485ad1f02c82f15f559c96ff54d603024;hb=e6db1df5a657ea0603e1ec0b1ea9b056264d470f;hp=b39bf31c01e6fe0884c9e3e0f7bbcff2fb86b0fb;hpb=50ecf259b61eb389559dc24a7c4af718c225ec8d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index b39bf31c0..ec5ebba48 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -29,6 +29,9 @@
  */
 class CoreExport CommandParser
 {
+ public:
+ 	typedef TR1NS::unordered_map<std::string, Command*, irc::insensitive, irc::StrHashComp> CommandMap;
+
  private:
 	/** Process a command from a user.
 	 * @param user The user to parse the command for
@@ -36,26 +39,33 @@ class CoreExport CommandParser
 	 */
 	void ProcessCommand(LocalUser* user, std::string& cmd);
 
- public:
 	/** Command list, a hash_map of command names to Command*
 	 */
-	Commandtable cmdlist;
+	CommandMap cmdlist;
 
+ public:
 	/** Default constructor.
 	 */
 	CommandParser();
 
+	/** Get a command name -> Command* map containing all client to server commands
+	 * @return A map of command handlers keyed by command names
+	 */
+	const CommandMap& GetCommands() const { return cmdlist; }
+
 	/** Calls the handler for a given command.
 	 * @param commandname The command to find. This should be in uppercase.
 	 * @param parameters Parameter list
 	 * @param user The user to call the handler on behalf of
+	 * @param cmd If non-NULL and the command was executed it is set to the command handler,
+	 * otherwise it isn't written to.
 	 * @return This method will return CMD_SUCCESS if the command handler was found and called,
 	 * and the command completeld successfully. It will return CMD_FAILURE if the command handler was found
 	 * and called, but the command did not complete successfully, and it will return CMD_INVALID if the
 	 * command simply did not exist at all or the wrong number of parameters were given, or the user
 	 * was not privilaged enough to execute the command.
 	 */
-	CmdResult CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user);
+	CmdResult CallHandler(const std::string& commandname, const std::vector<std::string>& parameters, User* user, Command** cmd = NULL);
 
 	/** Get the handler function for a command.
 	 * @param commandname The command required. Always use uppercase for this parameter.
@@ -75,7 +85,7 @@ class CoreExport CommandParser
 	 * With one list it is much simpler, and is used in NAMES, WHOIS, PRIVMSG etc.
 	 *
 	 * If there is only one list and there are duplicates in it, then the command handler is only called for
-	 * unique items. Entries are compared using "irc comparision" (see irc::string).
+	 * unique items. Entries are compared using "irc comparison".
 	 * If the usemax parameter is true (the default) the function only parses until it reaches
 	 * ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
 	 *
@@ -123,8 +133,9 @@ class CoreExport CommandParser
 	 * @param item The input string
 	 * @param dest The output string. The translation result will be appended to this string
 	 * @param custom_translator Used to translate the parameter if the translation type is TR_CUSTOM, if NULL, TR_CUSTOM will act like TR_TEXT
+	 * @param paramnumber The index of the parameter we are translating.
 	 */
-	static void TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, Command* custom_translator = NULL, unsigned int paramnumber = 0);
+	static void TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator = NULL, unsigned int paramnumber = 0);
 
 	/** Translate nicknames in a list of strings into UIDs, based on the TranslateTypes given.
 	 * @param to The translation types to use for the process. If this list is too short, TR_TEXT is assumed for the rest.
@@ -133,7 +144,7 @@ class CoreExport CommandParser
 	 * @param custom_translator Used to translate the parameter if the translation type is TR_CUSTOM, if NULL, TR_CUSTOM will act like TR_TEXT
 	 * @return dest The output string
 	 */
-	static std::string TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final = false, Command* custom_translator = NULL);
+	static std::string TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final = false, CommandBase* custom_translator = NULL);
 };
 
 /** A lookup table of values for multiplier characters used by