Replace Set*Help() functions with virtual *ServHelp() functions that can be overriden in a module's Module class. Patch from Adam.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2266 5417fbe8-f217-4b02-8779-1006273d7864

include/modules.h

@@ -307,13 +307,6 @@ class CoreExport Module
 
 	MODType type;
 
-	void (*nickHelp)(User *u); /* service 1 */
-	void (*chanHelp)(User *u); /* 2 */
-	void (*memoHelp)(User *u); /* 3 */
-	void (*botHelp)(User *u); /* 4 */
-	void (*operHelp)(User *u); /* 5 */
-	void (*hostHelp)(User *u); /* 6 */
-
 	MessageHash *msgList[MAX_CMD_HASH];
 	ModuleLang lang[NUM_LANGS];
 
@@ -355,47 +348,47 @@ class CoreExport Module
 	 */
 	void SetAuthor(const std::string &author);
 
-	/**
-	 * Add output to nickserv help.
-	 * when doing a /msg nickserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetNickHelp(void (*func)(User *));
+	/** Add output to NickServ Help.
+	 * When doing /msg NickServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void NickServHelp(User *u) { }
 
-	/**
-	 * Add output to chanserv help.
-	 * when doing a /msg chanserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetChanHelp(void (*func)(User *));
+	/** Add output to ChanServ Help.
+	 * When doing /msg ChanServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void ChanServHelp(User *u) { }
 
-	/**
-	 * Add output to memoserv help.
-	 * when doing a /msg memoserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetMemoHelp(void (*func)(User *));
+	/** Add output to MemoServ Help.
+	 * When doing /msg MemoServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void MemoServHelp(User *u) { }
 
-	/**
-	 * Add output to botserv help.
-	 * when doing a /msg botserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetBotHelp(void (*func)(User *));
+	/** Add output to BotServ Help.
+	 * When doing /msg BotServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void BotServHelp(User *u) { }
 
-	/**
-	 * Add output to operserv help.
-	 * when doing a /msg operserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetOperHelp(void (*func)(User *));
+	/** Add output to OperServ Help.
+	 * When doing /msg OperServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void OperServHelp(User *u) { }
 
-	/**
-	 * Add output to hostserv help.
-	 * when doing a /msg hostserv help, your function will be called to allow it to send out a notice() with the code you wish to dispaly
-	 * @param func a pointer to the function which will display the code
-	 **/
-	void SetHostHelp(void (*func)(User *));
+	/** Add output to HostServ Help.
+	 * When doing /msg HostServ HELP, this function will be calloed to allow it to send out
+	 * a notice witht he code you wish to display
+	 * @Param u The user executing the command
+	 */
+	virtual void HostServHelp(User *u) { }
 
 	/**
 	 * Allow a module to add a set of language strings to anope
@@ -466,8 +459,6 @@ class CoreExport Module
 	 **/
 	void DelCallback(const char *name);
 
-
-
 	/** Called when the ircd notifies that a user has been kicked from a channel.
 	 * @param c The channel the user has been kicked from.
 	 * @param target The user that has been kicked.
@@ -588,12 +579,6 @@ class CoreExport ModuleManager
 	 */
 	static void RunCallbacks();
 
-
-
-
-
-
-
 	/** Change the priority of one event in a module.
 	 * Each module event has a list of modules which are attached to that event type. If you wish to be called before or after other specific modules, you may use this
 	 * method (usually within void Module::Prioritize()) to set your events priority. You may use this call in other methods too, however, this is not supported behaviour
@@ -698,7 +683,7 @@ int encryption_module_init(); /* Load the encryption module */
 int protocol_module_init();	/* Load the IRCD Protocol Module up*/
 void moduleCallBackPrepForUnload(const char *mod_name);
 MDE void moduleCallBackDeleteEntry(ModuleCallBack * prev);
-MDE void moduleDisplayHelp(int service, User *u);
+MDE void moduleDisplayHelp(const char *service, User *u);
 
 /*************************************************************************/
 /*************************************************************************/

src/core/bs_act.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSAct : public Command
 {
  public:
@@ -81,19 +79,11 @@ class BSAct : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSAct(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT);
-}
-
 MODULE_INIT("bs_act", BSAct)

src/core/bs_assign.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSAssign : public Command
 {
  public:
@@ -93,18 +91,11 @@ class BSAssign : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSAssign, MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
 	}
 };
 
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN);
-}
-
 MODULE_INIT("bs_assign", BSAssign)

src/core/bs_badwords.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
 int badwords_del_callback(User * u, int num, va_list args);
 int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header);
 int badwords_list_callback(User * u, int num, va_list args);
@@ -311,21 +310,13 @@ class BSBadwords : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBadwords, MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS);
-}
-
 int badwords_del_callback(User * u, int num, va_list args)
 {
 	BadWord *bw;

src/core/bs_bot.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSBot : public Command
 {
  private:
@@ -446,21 +444,11 @@ class BSBot : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBot(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT);
-}
-
-
-
 MODULE_INIT("bs_bot", BSBot)

src/core/bs_botlist.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSBotList : public Command
 {
  public:
@@ -81,20 +79,11 @@ class BSBotList : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSBotList(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST);
-}
-
-
 MODULE_INIT("bs_botlist", BSBotList)

src/core/bs_help.c

@@ -33,7 +33,7 @@ class CommandBSHelp : public Command
 	{
 		// Abuse syntax error to display general list help.
 		notice_help(s_BotServ, u, BOT_HELP);
-		moduleDisplayHelp(4, u);
+		moduleDisplayHelp(s_BotServ, u);
 		notice_help(s_BotServ, u, BOT_HELP_FOOTER, BSMinUsers);
 	}
 };

src/core/bs_info.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSInfo : public Command
 {
  private:
@@ -258,19 +256,11 @@ class BSInfo : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSInfo(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO);
-}
-
 MODULE_INIT("bs_info", BSInfo)

src/core/bs_kick.c

@@ -17,7 +17,6 @@
 
 int do_kickcmd(User * u);
 
-void myBotServHelp(User * u);
 class CommandBSKick : public Command
 {
  public:
@@ -352,20 +351,11 @@ class BSKick : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSKick(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK);
-}
-
-
 MODULE_INIT("bs_kick", BSKick)

src/core/bs_say.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSSay : public Command
 {
  public:
@@ -90,20 +88,11 @@ class BSSay : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSSay(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY);
-}
-
-
 MODULE_INIT("bs_say", BSSay)

src/core/bs_set.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myBotServHelp(User * u);
-
 class CommandBSSet : public Command
 {
  public:
@@ -188,19 +186,11 @@ class BSSet : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSSet(), MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
 	}
 };
 
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_SET);
-}
-
 MODULE_INIT("bs_set", BSSet)

src/core/bs_unassign.c

@@ -16,7 +16,6 @@
 #include "module.h"
 
 int do_unassign(User * u);
-void myBotServHelp(User * u);
 
 class CommandBSUnassign : public Command
 {
@@ -66,20 +65,11 @@ class BSUnassign : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(BOTSERV, new CommandBSUnassign, MOD_UNIQUE);
-
-		this->SetBotHelp(myBotServHelp);
+	}
+	void BotServHelp(User *u)
+	{
+		notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
 	}
 };
 
-
-
-/**
- * Add the help response to Anopes /bs help output.
- * @param u The user who is requesting help
- **/
-void myBotServHelp(User * u)
-{
-	notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN);
-}
-
 MODULE_INIT("bs_unassign", BSUnassign)

src/core/cs_access.c

@@ -15,20 +15,6 @@
 
 #include "module.h"
 
-
-void myChanServHelp(User * u);
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
-}
-
-
 static int access_del(User * u, ChannelInfo *ci, ChanAccess * access, int *perm, int uacc)
 {
 	char *nick;
@@ -513,7 +499,11 @@ class CSAccess : public Module
 
 		this->AddCommand(CHANSERV, new CommandCSAccess(), MOD_UNIQUE);
 		this->AddCommand(CHANSERV, new CommandCSLevels(), MOD_UNIQUE);
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ACCESS);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LEVELS);
 	}
 };
 

src/core/cs_akick.c

@@ -15,11 +15,6 @@
 
 #include "module.h"
 
-
-void myChanServHelp(User * u);
-
-
-
 /* Split a usermask up into its constitutent parts.  Returned strings are
  * malloc()'d, and should be free()'d when done with.  Returns "*" for
  * missing parts.
@@ -51,16 +46,6 @@ static void split_usermask(const char *mask, const char **nick, const char **use
 	delete [] mask2;
 }
 
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
-}
-
 int akick_del(User * u, AutoKick * akick)
 {
 	if (!(akick->flags & AK_USED))
@@ -688,8 +673,10 @@ class CSAKick : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSAKick(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AKICK);
 	}
 };
 

src/core/cs_ban.c

@@ -15,19 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
-}
-
 class CommandCSBan : public Command
 {
  public:
@@ -188,8 +175,11 @@ class CSBan : public Module
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSBan(), MOD_UNIQUE);
 		this->AddCommand(CHANSERV, new CommandCSUnban(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_BAN);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNBAN);
 	}
 };
 

src/core/cs_clear.c

@@ -15,17 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
-}
-
 class CommandCSClear : public Command
 {
  public:
@@ -357,8 +346,10 @@ class CSClear : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSClear(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_CLEAR);
 	}
 };
 

src/core/cs_drop.c

@@ -15,18 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
-}
-
 class CommandCSDrop : public Command
 {
  public:
@@ -133,8 +121,10 @@ class CSDrop : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSDrop(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DROP);
 	}
 };
 

src/core/cs_forbid.c

@@ -15,17 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
-}
-
 class CommandCSForbid : public Command
 {
  public:
@@ -144,8 +133,10 @@ class CSForbid : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSForbid(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_FORBID);
 	}
 };
 

src/core/cs_getkey.c

@@ -15,16 +15,6 @@
 
 #include "module.h"
 
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
-}
-
 class CommandCSGetKey : public Command
 {
  public:
@@ -88,8 +78,10 @@ class CSGetKey : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSGetKey(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETKEY);
 	}
 };
 

src/core/cs_getpass.c

@@ -15,15 +15,6 @@
 
 #include "module.h"
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
-}
-
 class CommandCSGetPass : public Command
 {
  public:
@@ -86,12 +77,14 @@ class CSGetPass : public Module
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSGetPass(), MOD_UNIQUE);
 
-		this->SetChanHelp(myChanServHelp);
-
 		char tmp_pass[PASSMAX];
 		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
 			throw ModuleException("Incompatible with the encryption module being used");
 	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_GETPASS);
+	}
 };
 
 MODULE_INIT("cs_getpass", CSGetPass)

src/core/cs_help.c

@@ -54,7 +54,7 @@ class CommandCSHelp : public Command
 	void OnSyntaxError(User *u)
 	{
 		notice_help(s_ChanServ, u, CHAN_HELP);
-		moduleDisplayHelp(2, u);
+		moduleDisplayHelp(s_ChanServ, u);
 		if (CSExpire >= 86400)
 			notice_help(s_ChanServ, u, CHAN_HELP_EXPIRES, CSExpire / 86400);
 		if (u->nc && u->nc->IsServicesOper())

src/core/cs_identify.c

@@ -15,18 +15,6 @@
 
 #include "module.h"
 
-
-
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
-}
-
 class CommandCSIdentify : public Command
 {
  public:
@@ -118,10 +106,11 @@ class CSIdentify : public Module
 		this->AddCommand(CHANSERV, new CommandCSIdentify("IDENTIFY"), MOD_UNIQUE);
 		// XXX: we need aliases.
 		this->AddCommand(CHANSERV, new CommandCSIdentify("ID"), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_IDENTIFY);
 	}
 };
 
-
 MODULE_INIT("cs_identify", CSIdentify)

src/core/cs_info.c

@@ -15,17 +15,6 @@
 
 #include "module.h"
 
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
-}
-
-
 class CommandCSInfo : public Command
 {                  // cannot be const, as it is modified.
 	void CheckOptStr(std::string &buf, int opt, const std::string &str, ChannelInfo *ci, NickCore *nc)
@@ -185,8 +174,10 @@ class CSInfo : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSInfo(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INFO);
 	}
 };
 

src/core/cs_invite.c

@@ -15,16 +15,6 @@
 
 #include "module.h"
 
-
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
-}
-
 class CommandCSInvite : public Command
 {
  public:
@@ -88,8 +78,10 @@ class CSInvite : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSInvite(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_INVITE);
 	}
 };
 

src/core/cs_kick.c

@@ -15,15 +15,6 @@
 
 #include "module.h"
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
-}
-
 class CommandCSKick : public Command
 {
  public:
@@ -112,8 +103,10 @@ class CSKick : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSKick(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_KICK);
 	}
 };
 

src/core/cs_list.c

@@ -16,19 +16,6 @@
 #include "module.h"
 #include "hashcomp.h"
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	if (!CSListOpersOnly || (is_oper(u)))
-	{
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
-	}
-}
-
-
 class CommandCSList : public Command
 {
 public:
@@ -198,7 +185,13 @@ public:
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSList(), MOD_UNIQUE);
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		if (!CSListOpersOnly || (is_oper(u)))
+		{
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LIST);
+		}
 	}
 };
 

src/core/cs_logout.c

@@ -15,16 +15,6 @@
 
 #include "module.h"
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
-}
-
-
 class CommandCSLogout : public Command
 {
  private:
@@ -132,8 +122,10 @@ class CSLogout : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSLogout(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_LOGOUT);
 	}
 };
 

src/core/cs_modes.c

@@ -15,34 +15,6 @@
 
 #include "module.h"
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User * u)
-{
-	if (ircd->owner) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
-	}
-	if (ircd->protect) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
-	} else if (ircd->admin) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ADMIN);
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEADMIN);
-	}
-
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OP);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOP);
-	if (ircd->halfop) {
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
-	}
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOICE);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
-}
-
 /* do_util: not a command, but does the job of other */
 
 static CommandReturn do_util(User *u, CSModeUtil *util, const char *chan, const char *nick)
@@ -364,8 +336,29 @@ class CSModes : public Module
 			this->AddCommand(CHANSERV, new CommandCSOwner(), MOD_UNIQUE);
 			this->AddCommand(CHANSERV, new CommandCSDeOwner(), MOD_UNIQUE);
 		}
+	}
+	void ChanServHelp(User *u)
+	{
+		if (ircd->owner) {
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OWNER);
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOWNER);
+		}
+		if (ircd->protect) {
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_PROTECT);
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT);
+		} else if (ircd->admin) {
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_ADMIN);
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEADMIN);
+		}
 
-		this->SetChanHelp(myChanServHelp);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_OP);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEOP);
+		if (ircd->halfop) {
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HALFOP);
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP);
+		}
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOICE);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_DEVOICE);
 	}
 };
 

src/core/cs_register.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User * u);
-
 class CommandCSRegister : public Command
 {
  public:
@@ -150,18 +148,11 @@ class CSRegister : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSRegister(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
 	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_REGISTER);
-}
-
 MODULE_INIT("cs_register", CSRegister)

src/core/cs_sendpass.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User *u);
-
 class CommandCSSendPass : public Command
 {
  public:
@@ -97,8 +95,6 @@ class CSSendPass : public Module
 
 		this->AddCommand(CHANSERV, new CommandCSSendPass(), MOD_UNIQUE);
 
-		this->SetChanHelp(myChanServHelp);
-
 		if (!UseMail)
 			throw ModuleException("sendpass may not be loaded if UseMail is loaded");
 
@@ -106,15 +102,10 @@ class CSSendPass : public Module
 		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
 			throw ModuleException("Incompatible with the encryption module being used");
 	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
+	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SENDPASS);
-}
-
 MODULE_INIT("cs_sendpass", CSSendPass)

src/core/cs_set.c

@@ -725,11 +725,6 @@ class CommandCSSet : public Command
 	}
 };
 
-void myChanServHelp(User * u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET);
-}
-
 class CSSet : public Module
 {
  public:
@@ -739,9 +734,11 @@ class CSSet : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(CHANSERV, new CommandCSSet(), MOD_UNIQUE);
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SET);
 	}
 };
 
-
 MODULE_INIT("cs_set", CSSet)

src/core/cs_status.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User *u);
-
 class CommandCSStatus : public Command
 {
  public:
@@ -73,18 +71,11 @@ class CSStatus : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSStatus(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
 	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_STATUS);
-}
-
 MODULE_INIT("cs_status", CSStatus)

src/core/cs_suspend.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User *u);
-
 class CommandCSSuspend : public Command
 {
  public:
@@ -208,19 +206,12 @@ class CSSuspend : public Module
 
 		this->AddCommand(CHANSERV, new CommandCSSuspend(), MOD_UNIQUE);
 		this->AddCommand(CHANSERV, new CommandCSUnSuspend(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND);
 	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SUSPEND);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND);
-}
-
 MODULE_INIT("cs_suspend", CSSuspend)

src/core/cs_topic.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myChanServHelp(User *u);
-
 class CommandCSTopic : public Command
 {
  public:
@@ -91,18 +89,11 @@ class CSTopic : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(CHANSERV, new CommandCSTopic(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_TOPIC);
 	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_TOPIC);
-}
-
 MODULE_INIT("cs_topic", CSTopic)

src/core/cs_xop.c

@@ -18,7 +18,6 @@
 int xop_del_callback(User *u, int num, va_list args);
 int xop_list_callback(User *u, int num, va_list args);
 int xop_list(User *u, int index, ChannelInfo *ci, int *sent_header, int xlev, int xmsg);
-void myChanServHelp(User *u);
 
 enum
 {
@@ -506,24 +505,17 @@ class CSXOP : public Module
 			this->AddCommand(CHANSERV, new CommandCSHOP(), MOD_UNIQUE);
 		this->AddCommand(CHANSERV, new CommandCSSOP(), MOD_UNIQUE);
 		this->AddCommand(CHANSERV, new CommandCSVOP(), MOD_UNIQUE);
-
-		this->SetChanHelp(myChanServHelp);
+	}
+	void ChanServHelp(User *u)
+	{
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP);
+		if (ircd->halfop)
+			notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP);
+		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOP);
 	}
 };
 
-/**
- * Add the help response to anopes /cs help output.
- * @param u The user who is requesting help
- **/
-void myChanServHelp(User *u)
-{
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_SOP);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_AOP);
-	if (ircd->halfop)
-		notice_lang(s_ChanServ, u, CHAN_HELP_CMD_HOP);
-	notice_lang(s_ChanServ, u, CHAN_HELP_CMD_VOP);
-}
-
 /* `last' is set to the last index this routine was called with
  * `perm' is incremented whenever a permission-denied error occurs
  */

src/core/hs_del.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSDel : public Command
 {
  public:
@@ -72,18 +70,11 @@ class HSDel : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSDel(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_DEL);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_DEL);
-}
-
 MODULE_INIT("hs_del", HSDel)

src/core/hs_delall.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSDelAll : public Command
 {
  public:
@@ -79,18 +77,11 @@ class HSDelAll : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSDelAll(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_DELALL);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_DELALL);
-}
-
 MODULE_INIT("hs_delall", HSDelAll)

src/core/hs_group.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
 extern int do_hs_sync(NickCore *nc, char *vIdent, char *hostmask, char *creator, time_t time);
 
 class CommandHSGroup : public Command
@@ -94,18 +93,11 @@ class HSGroup : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSGroup(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_GROUP);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_GROUP);
-}
-
 MODULE_INIT("hs_group", HSGroup)

src/core/hs_help.c

@@ -32,7 +32,7 @@ class CommandHSHelp : public Command
 	void OnSyntaxError(User *u)
 	{
 		notice_help(s_HostServ, u, HOST_HELP, s_HostServ);
-		moduleDisplayHelp(6, u);
+		moduleDisplayHelp(s_HostServ, u);
 	}
 };
 

src/core/hs_list.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSList : public Command
 {
  public:
@@ -154,17 +152,11 @@ class HSList : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSList(), MOD_UNIQUE);
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_LIST);
-}
-
 MODULE_INIT("hs_list", HSList)

src/core/hs_off.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSOff : public Command
 {
  public:
@@ -65,18 +63,11 @@ class HSOff : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSOff(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_OFF);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_OFF);
-}
-
 MODULE_INIT("hs_off", HSOff)

src/core/hs_on.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSOn : public Command
 {
  public:
@@ -79,18 +77,11 @@ class HSOn : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSOn(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_ON);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_ON);
-}
-
 MODULE_INIT("hs_on", HSOn)

src/core/hs_set.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
-
 class CommandHSSet : public Command
 {
  public:
@@ -169,18 +167,11 @@ class HSSet : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSSet(), MOD_UNIQUE);
-
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_SET);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_SET);
-}
-
 MODULE_INIT("hs_set", HSSet)

src/core/hs_setall.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myHostServHelp(User *u);
 extern int do_hs_sync(NickCore *nc, char *vIdent, char *hostmask, char *creator, time_t time);
 
 class CommandHSSetAll : public Command
@@ -169,17 +168,11 @@ class HSSetAll : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(HOSTSERV, new CommandHSSetAll(), MOD_UNIQUE);
-		this->SetHostHelp(myHostServHelp);
+	}
+	void HostServHelp(User *u)
+	{
+		notice_lang(s_HostServ, u, HOST_HELP_CMD_SETALL);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myHostServHelp(User *u)
-{
-	notice_lang(s_HostServ, u, HOST_HELP_CMD_SETALL);
-}
-
 MODULE_INIT("hs_setall", HSSetAll)

src/core/ms_cancel.c

@@ -80,17 +80,11 @@ class MSCancel : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSCancel(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CANCEL);
-}
-
 MODULE_INIT("ms_cancel", MSCancel)

src/core/ms_check.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSCheck : public Command
 {
  public:
@@ -99,17 +97,11 @@ class MSCheck : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSCheck(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CHECK);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_CHECK);
-}
-
 MODULE_INIT("ms_check", MSCheck)

src/core/ms_del.c

@@ -16,7 +16,6 @@
 #include "module.h"
 
 int del_memo_callback(User *u, int num, va_list args);
-void myMemoServHelp(User *u);
 
 class CommandMSDel : public Command
 {
@@ -158,19 +157,13 @@ class MSDel : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSDel(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_DEL);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_DEL);
-}
-
 /**
  * Delete a single memo from a MemoInfo. callback function
  * @param u User Struct

src/core/ms_help.c

@@ -32,7 +32,7 @@ class CommandMSHelp : public Command
 	void OnSyntaxError(User *u)
 	{
 		notice_help(s_MemoServ, u, MEMO_HELP_HEADER);
-		moduleDisplayHelp(3, u);
+		moduleDisplayHelp(s_MemoServ, u);
 		notice_help(s_MemoServ, u, MEMO_HELP_FOOTER, s_ChanServ);
 	}
 };

src/core/ms_info.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSInfo : public Command
 {
  public:
@@ -218,17 +216,11 @@ class MSInfo : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSInfo(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_INFO);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_INFO);
-}
-
 MODULE_INIT("ms_info", MSInfo)

src/core/ms_list.c

@@ -17,7 +17,6 @@
 
 int list_memo_callback(User *u, int num, va_list args);
 int list_memo(User *u, int index, MemoInfo *mi, int *sent_header, int newi, const char *chan);
-void myMemoServHelp(User *u);
 
 class CommandMSList : public Command
 {
@@ -124,19 +123,13 @@ class MSList : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSList(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_LIST);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_LIST);
-}
-
 /**
  * list memno callback function
  * @param u User Struct

src/core/ms_read.c

@@ -17,7 +17,6 @@
 
 int read_memo_callback(User *u, int num, va_list args);
 int read_memo(User *u, int index, MemoInfo *mi, const char *chan);
-void myMemoServHelp(User *u);
 extern void rsend_notify(User *u, Memo *m, const char *chan);
 
 class CommandMSRead : public Command
@@ -131,19 +130,13 @@ class MSRead : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSRead(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_READ);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_READ);
-}
-
 /**
  * Read a memo callback function
  * @param u User Struct

src/core/ms_rsend.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSRSend : public Command
 {
  public:
@@ -89,20 +87,14 @@ class MSRSend : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSRSend(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
 
 		if (!MSMemoReceipt)
 			throw ModuleException("Don't like memo reciepts, or something.");
 	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
+	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_RSEND);
-}
-
 MODULE_INIT("ms_rsend", MSRSend)

src/core/ms_send.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSSend : public Command
 {
  public:
@@ -54,17 +52,11 @@ class MSSend : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSSend(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SEND);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SEND);
-}
-
 MODULE_INIT("ms_send", MSSend)

src/core/ms_sendall.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSSendAll : public Command
 {
  public:
@@ -81,17 +79,11 @@ class MSSendAll : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSSendAll(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SENDALL);
-}
-
 MODULE_INIT("ms_sendall", MSSendAll)

src/core/ms_set.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSSet : public Command
 {
  private:
@@ -266,18 +264,11 @@ class MSSet : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(MEMOSERV, new CommandMSSet(), MOD_UNIQUE);
-
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SET);
 	}
 };
 
-/**
- * Add the help response to anopes /hs help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_SET);
-}
-
 MODULE_INIT("ms_set", MSSet)

src/core/ms_staff.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myMemoServHelp(User *u);
-
 class CommandMSStaff : public Command
 {
  public:
@@ -79,17 +77,11 @@ class MSStaff : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(MEMOSERV, new CommandMSStaff(), MOD_UNIQUE);
-		this->SetMemoHelp(myMemoServHelp);
+	}
+	void MemoServHelp(User *u)
+	{
+		notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
 	}
 };
 
-/**
- * Add the help response to anopes /ms help output.
- * @param u The user who is requesting help
- **/
-void myMemoServHelp(User *u)
-{
-	notice_lang(s_MemoServ, u, MEMO_HELP_CMD_STAFF);
-}
-
 MODULE_INIT("ms_staff", MSStaff)

src/core/ns_access.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSAccess : public Command
 {
  private:
@@ -183,18 +181,11 @@ class NSAccess : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSAccess(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_ACCESS);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_ACCESS);
-}
-
 MODULE_INIT("ns_access", NSAccess)

src/core/ns_alist.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSAList : public Command
 {
  public:
@@ -153,18 +151,11 @@ class NSAList : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSAList(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_ALIST);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_ALIST);
-}
-
 MODULE_INIT("ns_alist", NSAList)

src/core/ns_drop.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSDrop : public Command
 {
  public:
@@ -120,18 +118,11 @@ class NSDrop : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSDrop(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_DROP);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_DROP);
-}
-
 MODULE_INIT("ns_drop", NSDrop)

src/core/ns_forbid.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
 NickAlias *makenick(const char *nick);
 
 class CommandNSForbid : public Command
@@ -110,20 +109,13 @@ class NSForbid : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSForbid(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_FORBID);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_FORBID);
-}
-
 NickAlias *makenick(const char *nick)
 {
 	NickAlias *na;

src/core/ns_getemail.c

@@ -20,8 +20,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSGetEMail : public Command
 {
  public:
@@ -80,18 +78,11 @@ class NSGetEMail : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGetEMail(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GETEMAIL);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_GETEMAIL);
-}
-
 MODULE_INIT("ns_getemail", NSGetEMail)

src/core/ns_getpass.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSGetPass : public Command
 {
  public:
@@ -91,21 +89,14 @@ class NSGetPass : public Module
 
 		this->AddCommand(NICKSERV, new CommandNSGetPass(), MOD_UNIQUE);
 
-		this->SetNickHelp(myNickServHelp);
-
 		char tmp_pass[PASSMAX];
 		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
 			throw ModuleException("Incompatible with the encryption module being used");
 	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS);
+	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_GETPASS);
-}
-
 MODULE_INIT("ns_getpass", NSGetPass)

src/core/ns_ghost.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSGhost : public Command
 {
  public:
@@ -98,18 +96,11 @@ class NSGhost : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSGhost(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GHOST);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_GHOST);
-}
-
 MODULE_INIT("ns_ghost", NSGhost)

src/core/ns_group.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 NickAlias *makealias(const char *nick, NickCore *nc);
 
 class CommandNSGroup : public Command
@@ -267,21 +265,14 @@ class NSGroup : public Module
 
 		this->AddCommand(NICKSERV, new CommandNSGroup(), MOD_UNIQUE);
 		this->AddCommand(NICKSERV, new CommandNSGList(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GROUP);
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_GLIST);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_GROUP);
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_GLIST);
-}
-
 /* Creates a new alias in NickServ database. */
 NickAlias *makealias(const char *nick, NickCore *nc)
 {

src/core/ns_help.c

@@ -43,7 +43,7 @@ class CommandNSHelp : public Command
 	void OnSyntaxError(User *u)
 	{
 		notice_help(s_NickServ, u, NICK_HELP);
-		moduleDisplayHelp(1, u);
+		moduleDisplayHelp(s_NickServ, u);
 		if (u->nc && u->nc->IsServicesOper())
 			notice_help(s_NickServ, u, NICK_SERVADMIN_HELP);
 		if (NSExpire >= 86400)

src/core/ns_identify.c

@@ -18,8 +18,6 @@
 #define TO_COLLIDE 0 /* Collide the user with this nick */
 #define TO_RELEASE 1 /* Release a collided nick */
 
-void myNickServHelp(User *u);
-
 class CommandNSIdentify : public Command
 {
  public:
@@ -135,18 +133,11 @@ class NSIdentify : public Module
 
 		this->AddCommand(NICKSERV, new CommandNSIdentify("IDENTIFY"), MOD_UNIQUE);
 		this->AddCommand(NICKSERV, new CommandNSIdentify("ID"), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_IDENTIFY);
-}
-
 MODULE_INIT("ns_identify", NSIdentify)

src/core/ns_info.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSInfo : public Command
 {
  private:
@@ -220,18 +218,11 @@ class NSInfo : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSInfo(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_INFO);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_INFO);
-}
-
 MODULE_INIT("ns_info", NSInfo)

src/core/ns_list.c

@@ -16,8 +16,6 @@
 #include "module.h"
 #include "hashcomp.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSList : public Command
 {
  public:
@@ -221,19 +219,12 @@ class NSList : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSList(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		if (!NSListOpersOnly || is_oper(u))
+			notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	if (!NSListOpersOnly || is_oper(u))
-		notice_lang(s_NickServ, u, NICK_HELP_CMD_LIST);
-}
-
 MODULE_INIT("ns_list", NSList)

src/core/ns_logout.c

@@ -18,8 +18,6 @@
 #define TO_COLLIDE 0 /* Collide the user with this nick */
 #define TO_RELEASE 1 /* Release a collided nick */
 
-void myNickServHelp(User *u);
-
 class CommandNSLogout : public Command
 {
  public:
@@ -112,18 +110,11 @@ class NSLogout : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSLogout(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_LOGOUT);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_LOGOUT);
-}
-
 MODULE_INIT("ns_logout", NSLogout)

src/core/ns_recover.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSRecover : public Command
 {
  public:
@@ -117,18 +115,11 @@ class NSRecover : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSRecover(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_RECOVER);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_RECOVER);
-}
-
 MODULE_INIT("ns_recover", NSRecover)

src/core/ns_register.c

@@ -16,7 +16,6 @@
 #include "module.h"
 #include "encrypt.h"
 
-void myNickServHelp(User *u);
 NickRequest *makerequest(const char *nick);
 NickAlias *makenick(const char *nick);
 int do_sendregmail(User *u, NickRequest *nr);
@@ -423,25 +422,18 @@ class NSRegister : public Module
 		this->AddCommand(NICKSERV, new CommandNSRegister(), MOD_UNIQUE);
 		this->AddCommand(NICKSERV, new CommandNSConfirm("CONFIRM", 0, 1), MOD_UNIQUE);
 		this->AddCommand(NICKSERV, new CommandNSResend(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_REGISTER);
+		if (NSEmailReg)
+		{
+			notice_lang(s_NickServ, u, NICK_HELP_CMD_CONFIRM);
+			notice_lang(s_NickServ, u, NICK_HELP_CMD_RESEND);
+		}
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_REGISTER);
-	if (NSEmailReg)
-	{
-		notice_lang(s_NickServ, u, NICK_HELP_CMD_CONFIRM);
-		notice_lang(s_NickServ, u, NICK_HELP_CMD_RESEND);
-	}
-}
-
 /*************************************************************************/
 
 NickRequest *makerequest(const char *nick)

src/core/ns_release.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSRelease : public Command
 {
  public:
@@ -99,18 +97,11 @@ class NSRelease : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSRelease(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_RELEASE);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_RELEASE);
-}
-
 MODULE_INIT("ns_release", NSRelease)

src/core/ns_saset.c

@@ -16,8 +16,6 @@
 #include "module.h"
 #include "encrypt.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSSASet : public Command
 {
 private:
@@ -588,18 +586,11 @@ public:
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSASet(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_SASET);
-}
-
 MODULE_INIT("ns_saset", NSSASet)

src/core/ns_sendpass.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSSendPass : public Command
 {
  public:
@@ -96,8 +94,6 @@ class NSSendPass : public Module
 
 		this->AddCommand(NICKSERV, new CommandNSSendPass(), MOD_UNIQUE);
 
-		this->SetNickHelp(myNickServHelp);
-
 		if (!UseMail)
 			throw ModuleException("Not using mail, whut.");
 
@@ -105,15 +101,10 @@ class NSSendPass : public Module
 		if (!enc_decrypt("tmp", tmp_pass, PASSMAX - 1))
 			throw ModuleException("Incompatible with the encryption module being used");
 	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SENDPASS);
+	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_SENDPASS);
-}
-
 MODULE_INIT("ns_sendpass", NSSendPass)

src/core/ns_set.c

@@ -16,8 +16,6 @@
 #include "module.h"
 #include "encrypt.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSSet : public Command
 {
  private:
@@ -544,18 +542,11 @@ class NSSet : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSSet(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SET);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_SET);
-}
-
 MODULE_INIT("ns_set", NSSet)

src/core/ns_status.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSStatus : public Command
 {
  public:
@@ -73,18 +71,11 @@ class NSStatus : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(NICKSERV, new CommandNSStatus(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_STATUS);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_STATUS);
-}
-
 MODULE_INIT("ns_status", NSStatus)

src/core/ns_suspend.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSSuspend : public Command
 {
  public:
@@ -182,19 +180,12 @@ class NSSuspend : public Module
 
 		this->AddCommand(NICKSERV, new CommandNSSuspend(), MOD_UNIQUE);
 		this->AddCommand(NICKSERV, new CommandNSUnSuspend(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND);
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_SUSPEND);
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_UNSUSPEND);
-}
-
 MODULE_INIT("ns_suspend", NSSuspend)

src/core/ns_update.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myNickServHelp(User *u);
-
 class CommandNSUpdate : public Command
 {
  public:
@@ -64,18 +62,11 @@ class NSUpdate : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(NICKSERV, new CommandNSUpdate(), MOD_UNIQUE);
-
-		this->SetNickHelp(myNickServHelp);
+	}
+	void NickServHelp(User *u)
+	{
+		notice_lang(s_NickServ, u, NICK_HELP_CMD_UPDATE);
 	}
 };
 
-/**
- * Add the help response to anopes /ns help output.
- * @param u The user who is requesting help
- **/
-void myNickServHelp(User *u)
-{
-	notice_lang(s_NickServ, u, NICK_HELP_CMD_UPDATE);
-}
-
 MODULE_INIT("ns_update", NSUpdate)

src/core/os_admin.c

@@ -17,7 +17,6 @@
 
 int admin_list_callback(SList *slist, int number, void *item, va_list args);
 int admin_list(int number, NickCore *nc, User *u, int *sent_header);
-void myOperServHelp(User *u);
 
 class CommandOSAdmin : public Command
 {
@@ -250,20 +249,13 @@ class OSAdmin : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSAdmin(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_ADMIN);
-}
-
 int admin_list_callback(SList *slist, int number, void *item, va_list args)
 {
 	User *u = va_arg(args, User *);

src/core/os_akill.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
 int akill_view_callback(SList *slist, int number, void *item, va_list args);
 int akill_list_callback(SList *slist, int number, void *item, va_list args);
 int akill_view(int number, Akill *ak, User *u, int *sent_header);
@@ -331,20 +330,13 @@ class OSAKill : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSAKill(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_AKILL);
-}
-
 int akill_view(int number, Akill *ak, User *u, int *sent_header)
 {
 	char mask[BUFSIZE];

src/core/os_chankill.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSChanKill : public Command
 {
  public:
@@ -112,18 +110,11 @@ class OSChanKill : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSChanKill(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANKILL);
-}
-
 MODULE_INIT("os_chankill", OSChanKill)

src/core/os_chanlist.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSChanList : public Command
 {
  public:
@@ -89,18 +87,11 @@ class OSChanList : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSChanList(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_CHANLIST);
-}
-
 MODULE_INIT("os_chanlist", OSChanList)

src/core/os_clearmodes.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSClearModes : public Command
 {
  public:
@@ -255,18 +253,11 @@ class OSClearModes : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSClearModes(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_CLEARMODES);
-}
-
 MODULE_INIT("os_clearmodes", OSClearModes)

src/core/os_defcon.c

@@ -17,8 +17,6 @@
 
 void defcon_sendlvls(User *u);
 
-void myOperServHelp(User *u);
-
 class CommandOSDEFCON : public Command
 {
  public:
@@ -98,20 +96,13 @@ class OSDEFCON : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSDEFCON(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_DEFCON);
-}
-
 /**
  * Send a message to the oper about which precautions are "active" for this level
  **/

src/core/os_global.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSGlobal : public Command
 {
  public:
@@ -56,17 +54,11 @@ class OSGlobal : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSGlobal(), MOD_UNIQUE);
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_GLOBAL);
-}
-
 MODULE_INIT("os_global", OSGlobal)

src/core/os_help.c

@@ -31,7 +31,7 @@ class CommandOSHelp : public Command
 	void OnSyntaxError(User *u)
 	{
 		notice_help(s_OperServ, u, OPER_HELP);
-		moduleDisplayHelp(5, u);
+		moduleDisplayHelp(s_OperServ, u);
 		notice_help(s_OperServ, u, OPER_HELP_LOGGED);
 	}
 };

src/core/os_ignore.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSIgnore : public Command
 {
  private:
@@ -141,18 +139,11 @@ class OSIgnore : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSIgnore(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_IGNORE);
-}
-
 MODULE_INIT("os_ignore", OSIgnore)

src/core/os_jupe.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSJupe : public Command
 {
  public:
@@ -67,18 +65,11 @@ class OSJupe : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSJupe(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_JUPE);
-}
-
 MODULE_INIT("os_jupe", OSJupe)

src/core/os_kick.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSKick : public Command
 {
  public:
@@ -75,18 +73,11 @@ class OSKick : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSKick(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_KICK);
-}
-
 MODULE_INIT("os_kick", OSKick)

src/core/os_mode.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSMode : public Command
 {
  public:
@@ -71,18 +69,11 @@ class OSMode : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSMode(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE);
 	}
 };
 
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODE);
-}
-
 MODULE_INIT("os_mode", OSMode)

src/core/os_modinfo.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
 int showModuleCmdLoaded(CommandHash *cmdList, const char *mod_name, User *u);
 
 class CommandOSModInfo : public Command
@@ -75,21 +74,13 @@ class OSModInfo : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSModInfo(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODINFO);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODINFO);
-}
-
 int showModuleCmdLoaded(CommandHash *cmdList, const char *mod_name, User *u)
 {
 	Command *c;

src/core/os_modlist.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSModList : public Command
 {
  public:
@@ -180,19 +178,11 @@ class OSModList : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSModList(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLIST);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLIST);
-}
-
 MODULE_INIT("os_modlist", OSModList)

src/core/os_modload.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSModLoad : public Command
 {
  public:
@@ -67,19 +65,11 @@ class OSModLoad : public Module
 		this->SetPermanent(true);
 
 		this->AddCommand(OPERSERV, new CommandOSModLoad(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODLOAD);
-}
-
 MODULE_INIT("os_modload", OSModLoad)

src/core/os_modunload.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSModUnLoad : public Command
 {
  public:
@@ -69,19 +67,11 @@ class OSModUnLoad : public Module
 		this->SetPermanent(true);
 
 		this->AddCommand(OPERSERV, new CommandOSModUnLoad(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_MODUNLOAD);
-}
-
 MODULE_INIT("os_modunload", OSModUnLoad)

src/core/os_news.c

@@ -15,7 +15,6 @@
 
 #include "module.h"
 
-
 /* List of messages for each news type.  This simplifies message sending. */
 
 #define MSG_SYNTAX	0
@@ -32,9 +31,6 @@
 #define MSG_DELETED_ALL	11
 #define MSG_MAX		11
 
-
-void myOperServHelp(User *u);
-
 struct newsmsgs {
 	int16 type;
 	const char *name;
@@ -369,8 +365,12 @@ class OSNews : public Module
 		this->AddCommand(OPERSERV, OSOperNews, MOD_UNIQUE);
 		this->AddCommand(OPERSERV, new CommandOSRandomNews(), MOD_UNIQUE);
 		ModuleManager::Attach(I_OnReload, this);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS);
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS);
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS);
 	}
 
 	void OnReload(bool starting)
@@ -380,17 +380,4 @@ class OSNews : public Module
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_LOGONNEWS);
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_OPERNEWS);
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS);
-}
-
-
 MODULE_INIT("os_news", OSNews)

src/core/os_noop.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSNOOP : public Command
 {
  public:
@@ -83,20 +81,11 @@ class OSNOOP : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSNOOP(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP);
 	}
 };
 
-
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_NOOP);
-}
-
 MODULE_INIT("os_noop", OSNOOP)

src/core/os_oline.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSOLine : public Command
 {
  public:
@@ -83,22 +81,13 @@ class OSOLine : public Module
 
 		this->AddCommand(OPERSERV, new CommandOSOLine(), MOD_UNIQUE);
 
-		this->SetOperHelp(myOperServHelp);
-
 		if (!ircd->omode)
 			throw ModuleException("Your IRCd does not support OMODE.");
-
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_OLINE);
-}
-
 MODULE_INIT("os_oline", OSOLine)

src/core/os_oper.c

@@ -17,7 +17,6 @@
 
 int oper_list_callback(SList *slist, int number, void *item, va_list args);
 int oper_list(int number, NickCore *nc, User *u, int *sent_header);
-void myOperServHelp(User *u);
 
 class CommandOSOper : public Command
 {
@@ -245,21 +244,13 @@ class OSOper : public Module
 		this->SetVersion("$Id$");
 		this->SetType(CORE);
 		this->AddCommand(OPERSERV, new CommandOSOper(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_OPER);
-}
-
 /* Lists an oper entry, prefixing it with the header if needed */
 int oper_list(int number, NickCore *nc, User *u, int *sent_header)
 {

src/core/os_quit.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSQuit : public Command
 {
  public:
@@ -63,19 +61,11 @@ class OSQuit : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSQuit(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_QUIT);
-}
-
 MODULE_INIT("os_quit", OSQuit)

src/core/os_reload.c

@@ -15,8 +15,6 @@
 
 #include "module.h"
 
-void myOperServHelp(User *u);
-
 class CommandOSReload : public Command
 {
  public:
@@ -58,19 +56,11 @@ class OSReload : public Module
 		this->SetType(CORE);
 
 		this->AddCommand(OPERSERV, new CommandOSReload(), MOD_UNIQUE);
-
-		this->SetOperHelp(myOperServHelp);
+	}
+	void OperServHelp(User *u)
+	{
+		notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD);
 	}
 };
 
-
-/**
- * Add the help response to anopes /os help output.
- * @param u The user who is requesting help
- **/
-void myOperServHelp(User *u)
-{
-	notice_lang(s_OperServ, u, OPER_HELP_CMD_RELOAD);
-}
-
 MODULE_INIT("os_reload", OSReload)