X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=62f47bd2df8ef2f440e8f9e0393221ef142b9828;hb=5d67a5fff127bf95bca69b436ef7f645f2fe3281;hp=b34c3cb7f83b1a496777de8dcd4f109150deb5d1;hpb=61185fc62b7d3d05e33a116fca26aa9dc72ab691;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index b34c3cb7f..62f47bd2d 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -118,7 +118,7 @@ class CoreExport CommandParser : public classbase
 	 * 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 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,
@@ -192,11 +192,8 @@ class CoreExport CommandParser : public classbase
 	bool CreateCommand(Command *f, void* so_handle = NULL);
 
 	/** Insert the default RFC1459 commands into the command hash.
-	 * Ignore any already loaded commands.
-	 * @param user User to spool errors to, or if NULL, when an error occurs spool the errors to
-	 * stdout then exit with EXIT_STATUS_HANDLER.
 	 */
-	void SetupCommandTable(User* user);
+	void SetupCommandTable();
 
 	/** Translate nicknames in a string into UIDs, based on the TranslationType given.
 	 * @param to The translation type to use for the process.
@@ -205,17 +202,19 @@ class CoreExport CommandParser : public classbase
 	 * @return returns the number of substitutions made. Will always be 0 or 1 for TR_TEXT and 0..n for other types.
 	 */
 	int TranslateUIDs(TranslateType to, const std::string &source, std::string &dest);
+
+	int TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest);
 };
 
 /** Command handler class for the RELOAD command.
  * A command cant really reload itself, so this has to be in here.
  */
-class cmd_reload : public Command
+class CommandReload : public Command
 {
  public:
 	/** Standard constructor
 	 */
-	cmd_reload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
+	CommandReload (InspIRCd* Instance) : Command(Instance,"RELOAD","o",1) { syntax = "<core-command>"; }
 	/** Handle RELOAD
 	 */
 	CmdResult Handle(const std::vector<std::string>& parameters, User *user);
@@ -234,9 +233,9 @@ const int duration_multi[] =
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 86400, 1, 1, 1, 3600,
 	1, 1, 1, 1, 60, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-	604800, 1, 31536000, 1, 1, 1, 1, 1, 1, 1, 1,
+	604800, 1, 31557600, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 86400, 1, 1, 1, 3600, 1, 1, 1, 1, 60,
-	1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31536000,
+	1, 1, 1, 1, 1, 1, 1, 1, 1, 604800, 1, 31557600,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
 	1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@ -249,4 +248,3 @@ const int duration_multi[] =
 };
 
 #endif
-