X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=6682bc4fbb2bd45f579592332be1268557038e99;hb=fabe111fb9e37c86beeecc773b9ad03c7046ccbf;hp=7809b67b889d8d377b7a93cf548b9f060fd67f57;hpb=97449ad5695dd63841c9e8426e75f3c6543c16da;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index 7809b67b8..6682bc4fb 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
@@ -70,16 +63,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:
@@ -135,23 +118,23 @@ class CoreExport CommandParser
 	 */
 	void RemoveCommand(Command* x);
 
-	/** Translate nicknames in a string into UIDs, based on the TranslationType given.
-	 * @param to The translation type to use for the process.
-	 * @param source The input string
-	 * @param dest The output string, it is safe to pass source and dest as the same variable only for translation type TR_TEXT.
-	 * @return returns the number of substitutions made. Will always be 0 or 1
+	/** Translate a single item based on the TranslationType given.
+	 * @param to The translation type to use for the process
+	 * @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.
 	 */
-	int TranslateUIDs(TranslateType to, const std::string &source, std::string &dest);
+	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.
 	 * @param source The strings to translate
-	 * @param dest The output string
 	 * @param prefix_final True if the final source argument should have a colon prepended (if it could contain a space)
-	 * @param custom_translator Used to translate the parameter if the TR_CUSTOM type is found in to
-	 * @return returns the number of substitutions made.
+	 * @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
 	 */
-	int TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, 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