X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fcommand_parse.h;h=c2606a97d9e46d7081719be7b2688dc75cab8b4f;hb=28de37791e17a1f1f3fd431969f5b6fd393eb73f;hp=a8a14497e88808d6a001dd229c52f9d865b9576e;hpb=ffbd1eebf0b82bf40482879f410f58874030a695;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/command_parse.h b/include/command_parse.h
index a8a14497e..c2606a97d 100644
--- a/include/command_parse.h
+++ b/include/command_parse.h
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -74,7 +74,7 @@ class CoreExport CommandParser : public classbase
  public:
 	/** Command list, a hash_map of command names to Command*
 	 */
-	Commandable cmdlist;
+	Commandtable cmdlist;
 
 	/** Reload a core command.
 	 * This will only reload commands implemented by the core,
@@ -93,8 +93,7 @@ class CoreExport CommandParser : public classbase
 
 	/** Calls the handler for a given command.
 	 * @param commandname The command to find. This should be in uppercase.
-	 * @param parameters Parameter list as an array of array of char (that's not a typo).
-	 * @param pcnt The number of items in the parameters list
+	 * @param parameters Parameter list
 	 * @param user The user to call the handler on behalf of
 	 * @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
@@ -193,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.
@@ -211,12 +207,12 @@ class CoreExport CommandParser : public classbase
 /** 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);
@@ -235,9 +231,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,