X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=bd778c3d2cd6f811af0d75ad698add77f2f3c1a1;hb=4498f1abd163b140efcbbd9e75173665c9b1c29f;hp=10dbef58d6106072afd63983c91189bd835f716a;hpb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index 10dbef58d..bd778c3d2 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,7 +23,7 @@ typedef std::map<std::string, void*> SharedObjectList;
  * call command handlers by name, and chop up comma seperated
  * parameters into multiple calls.
  */
-class CoreExport CommandParser : public classbase
+class CoreExport CommandParser
 {
  private:
 	/** Parameter buffer
@@ -41,12 +41,8 @@ class CoreExport CommandParser : public classbase
 	 * @param user The user to parse the command for
 	 * @param cmd The command string to process
 	 */
-	bool ProcessCommand(User *user, std::string &cmd);
+	bool ProcessCommand(LocalUser *user, std::string &cmd);
 
-	/** Removes a command if the sources match. Used as a helper for
-	 *  safe hash_map delete while iter in RemoveCommands(const char* source).
-	 */
-	void RemoveCommand(nspace::hash_map<std::string,Command*>::iterator safei, Module* source);
 
 
  public:
@@ -105,56 +101,27 @@ class CoreExport CommandParser : public classbase
 	 * @param The number of items in the parameters list
 	 * @param splithere The first parameter index to split as a comma seperated list
 	 * @param extra The second parameter index to split as a comma seperated list
+	 * @param usemax Limit the command to MaxTargets targets
 	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
 	 * caller should return without doing anything, otherwise it should continue into its main section of code.
 	 */
-	int LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra);
-
-	/** LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
-	 * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
-	 * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
-	 * the channel names and their keys as follows:
-	 *
-	 * JOIN #chan1,#chan2,#chan3 key1,,key3
-	 *
-	 * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
-	 * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
-	 * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
-	 * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
-	 *
-	 * @param user The user who sent the command
-	 * @param CommandObj the command object to call for each parameter in the list
-	 * @param parameters Parameter list as an array of array of char (that's not a typo).
-	 * @param The number of items in the parameters list
-	 * @param splithere The first parameter index to split as a comma seperated list
-	 * @param extra The second parameter index to split as a comma seperated list
-	 * @return This function will return 1 when there are no more parameters to process. When this occurs, its
-	 * caller should return without doing anything, otherwise it should continue into its main section of code.
-	 */
-	int LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere);
+	int LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, int extra = -1, bool usemax = true);
 
 	/** Take a raw input buffer from a recvq, and process it on behalf of a user.
 	 * @param buffer The buffer line to process
 	 * @param user The user to whom this line belongs
 	 */
-	bool ProcessBuffer(std::string &buffer,User *user);
-
-	/** Process lines in a users sendq.
-	 * @param current The user to process
-	 * @param one_only if one_only is set only one command is processed from the sendq.
-	 */
-	void DoLines(User* current, bool one_only = false);
-
-	/** Remove all commands relating to module 'source'.
-	 * @param source A module which has introduced new commands
-	 */
-	void RemoveCommands(Module* source);
+	bool ProcessBuffer(std::string &buffer,LocalUser *user);
 
 	/** Add a new command to the commands hash
 	 * @param f The new Command to add to the list
 	 * @return True if the command was added
 	 */
-	bool CreateCommand(Command *f);
+	bool AddCommand(Command *f);
+
+	/** Removes a command.
+	 */
+	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.