X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=70544b0c8e17d1752d6f67814e5b0c2bbab10e9d;hb=869fd6ca2822ef45ad7c3939b9ab7418200daf3e;hp=48015161261934ca3201cb4b04df9d9bf8c74bca;hpb=05c816fcb2a8ca0ff97472f756aa28a04084de33;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index 480151612..70544b0c8 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -30,13 +30,6 @@
 class CoreExport CommandParser
 {
  private:
-	/** Process a parameter string into a list of items
-	 * @param command_p The output list of items
-	 * @param parameters The input string
-	 * @return The number of parameters parsed into command_p
-	 */
-	int ProcessParameters(std::vector<std::string>& command_p, char* parameters);
-
 	/** Process a command from a user.
 	 * @param user The user to parse the command for
 	 * @param cmd The command string to process
@@ -56,13 +49,15 @@ class CoreExport CommandParser
 	 * @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.
@@ -70,16 +65,6 @@ class CoreExport CommandParser
 	 */
 	Command* GetHandler(const std::string &commandname);
 
-	/** This function returns true if a command is valid with the given number of parameters and user.
-	 * @param commandname The command name to check
-	 * @param pcnt The parameter count
-	 * @param user The user to check against
-	 * @return If the user given has permission to execute the command, and the parameter count is
-	 * equal to or greater than the minimum number of parameters to the given command, then this
-	 * function will return true, otherwise it will return false.
-	 */
-	bool IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user);
-
 	/** LoopCall is used to call a command handler repeatedly based on the contents of a comma seperated list.
 	 * There are two ways to call this method, either with one potential list or with two potential lists.
 	 * We need to handle two potential lists for JOIN, because a JOIN may contain two lists of items at once:
@@ -140,8 +125,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.
@@ -150,7 +136,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