diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/core/ns_access.c | 41 | ||||
-rw-r--r-- | src/core/ns_alist.c | 42 | ||||
-rw-r--r-- | src/core/ns_drop.c | 46 | ||||
-rw-r--r-- | src/core/ns_forbid.c | 42 | ||||
-rw-r--r-- | src/core/ns_getemail.c | 42 | ||||
-rw-r--r-- | src/core/ns_getpass.c | 42 | ||||
-rw-r--r-- | src/core/ns_ghost.c | 41 | ||||
-rw-r--r-- | src/core/ns_group.c | 55 | ||||
-rw-r--r-- | src/core/ns_help.c | 37 | ||||
-rw-r--r-- | src/core/ns_identify.c | 51 | ||||
-rw-r--r-- | src/core/ns_info.c | 43 | ||||
-rw-r--r-- | src/core/ns_list.c | 41 | ||||
-rw-r--r-- | src/core/ns_logout.c | 42 | ||||
-rw-r--r-- | src/core/ns_recover.c | 39 | ||||
-rw-r--r-- | src/core/ns_register.c | 49 | ||||
-rw-r--r-- | src/core/ns_release.c | 39 | ||||
-rw-r--r-- | src/core/ns_saset.c | 119 | ||||
-rw-r--r-- | src/core/ns_sendpass.c | 54 | ||||
-rw-r--r-- | src/core/ns_set.c | 106 | ||||
-rw-r--r-- | src/core/ns_status.c | 41 | ||||
-rw-r--r-- | src/core/ns_suspend.c | 48 | ||||
-rw-r--r-- | src/core/ns_update.c | 41 |
22 files changed, 392 insertions, 709 deletions
diff --git a/src/core/ns_access.c b/src/core/ns_access.c index 5912a500d..e6d89d8f5 100644 --- a/src/core/ns_access.c +++ b/src/core/ns_access.c @@ -18,36 +18,23 @@ int do_access(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSAccess : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSAccess(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("ACCESS", do_access, NULL, NICK_HELP_ACCESS, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -188,4 +175,4 @@ int do_access(User * u) return MOD_CONT; } -MODULE_INIT("ns_access") +MODULE_INIT(NSAccess) diff --git a/src/core/ns_alist.c b/src/core/ns_alist.c index 7189439dd..3a0b0c929 100644 --- a/src/core/ns_alist.c +++ b/src/core/ns_alist.c @@ -18,37 +18,23 @@ int do_alist(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSAList : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSAList(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, - NICK_SERVADMIN_HELP_ALIST, - NICK_SERVADMIN_HELP_ALIST); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("ALIST", do_alist, NULL, -1, NICK_HELP_ALIST, -1, NICK_SERVADMIN_HELP_ALIST, NICK_SERVADMIN_HELP_ALIST); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -185,4 +171,4 @@ int do_alist(User * u) return MOD_CONT; } -MODULE_INIT("ns_alist") +MODULE_INIT(NSAList) diff --git a/src/core/ns_drop.c b/src/core/ns_drop.c index bd12cdbbf..ad9f7d363 100644 --- a/src/core/ns_drop.c +++ b/src/core/ns_drop.c @@ -19,39 +19,25 @@ int do_drop(User * u); int do_unlink(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSDrop : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1, - NICK_SERVADMIN_HELP_DROP, NICK_SERVADMIN_HELP_DROP); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("UNLINK", do_unlink, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + public: + NSDrop(const std::string &creator) : Module(creator) + { + Command *c; -/** - * Unload the module - **/ -void AnopeFini(void) -{ + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); -} + c = createCommand("DROP", do_drop, NULL, -1, NICK_HELP_DROP, -1, NICK_SERVADMIN_HELP_DROP, NICK_SERVADMIN_HELP_DROP); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("UNLINK", do_unlink, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleSetNickHelp(myNickServHelp); + } +}; /** @@ -155,4 +141,4 @@ int do_unlink(User * u) return MOD_CONT; } -MODULE_INIT("ns_drop") +MODULE_INIT(NSDrop) diff --git a/src/core/ns_forbid.c b/src/core/ns_forbid.c index e244c2dc5..9a6ca3941 100644 --- a/src/core/ns_forbid.c +++ b/src/core/ns_forbid.c @@ -19,37 +19,23 @@ int do_forbid(User * u); void myNickServHelp(User * u); NickAlias *makenick(const char *nick); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSForbid : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSForbid(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, - NICK_SERVADMIN_HELP_FORBID, - NICK_SERVADMIN_HELP_FORBID); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("FORBID", do_forbid, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_FORBID, NICK_SERVADMIN_HELP_FORBID); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -154,4 +140,4 @@ NickAlias *makenick(const char *nick) return na; } -MODULE_INIT("ns_forbid") +MODULE_INIT(NSForbid) diff --git a/src/core/ns_getemail.c b/src/core/ns_getemail.c index 5985fb123..9490d8a17 100644 --- a/src/core/ns_getemail.c +++ b/src/core/ns_getemail.c @@ -23,37 +23,23 @@ int do_getemail(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSGetEMail : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSGetEMail(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, - -1, NICK_SERVADMIN_HELP_GETEMAIL, - NICK_SERVADMIN_HELP_GETEMAIL); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("GETEMAIL", do_getemail, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETEMAIL, NICK_SERVADMIN_HELP_GETEMAIL); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; /** * Add the help response to anopes /ns help output. @@ -101,4 +87,4 @@ int do_getemail(User * u) return MOD_CONT; } -MODULE_INIT("ns_getemail") +MODULE_INIT(NSGetEMail) diff --git a/src/core/ns_getpass.c b/src/core/ns_getpass.c index 35589211c..24f2f93de 100644 --- a/src/core/ns_getpass.c +++ b/src/core/ns_getpass.c @@ -18,37 +18,23 @@ int do_getpass(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSGetPass : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSGetPass(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, - NICK_SERVADMIN_HELP_GETPASS, - NICK_SERVADMIN_HELP_GETPASS); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("GETPASS", do_getpass, is_services_admin, -1, -1, -1, NICK_SERVADMIN_HELP_GETPASS, NICK_SERVADMIN_HELP_GETPASS); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; /** * Add the help response to anopes /ns help output. @@ -111,4 +97,4 @@ int do_getpass(User * u) return MOD_CONT; } -MODULE_INIT("ns_getpass") +MODULE_INIT(NSGetPass) diff --git a/src/core/ns_ghost.c b/src/core/ns_ghost.c index 689fd2aff..5a0da7a3a 100644 --- a/src/core/ns_ghost.c +++ b/src/core/ns_ghost.c @@ -18,36 +18,23 @@ int do_ghost(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSGhost : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSGhost(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, - -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("GHOST", do_ghost, NULL, NICK_HELP_GHOST, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -121,4 +108,4 @@ int do_ghost(User * u) return MOD_CONT; } -MODULE_INIT("ns_ghost") +MODULE_INIT(NSGhost) diff --git a/src/core/ns_group.c b/src/core/ns_group.c index 4a31eb988..d9f3748a5 100644 --- a/src/core/ns_group.c +++ b/src/core/ns_group.c @@ -25,47 +25,32 @@ NickAlias *makealias(const char *nick, NickCore * nc); /* Obsolete commands */ int do_link(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSGroup : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSGroup(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, - -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - c = createCommand("LINK", do_link, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("GROUP", do_group, NULL, NICK_HELP_GROUP, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("GLIST", do_glist, NULL, -1, NICK_HELP_GLIST, -1, - NICK_SERVADMIN_HELP_GLIST, - NICK_SERVADMIN_HELP_GLIST); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("LINK", do_link, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("LISTLINKS", do_listlinks, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("GLIST", do_glist, NULL, -1, NICK_HELP_GLIST, -1, NICK_SERVADMIN_HELP_GLIST, NICK_SERVADMIN_HELP_GLIST); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("LISTLINKS", do_listlinks, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -326,4 +311,4 @@ int do_listlinks(User * u) return MOD_CONT; } -MODULE_INIT("ns_group") +MODULE_INIT(NSGroup) diff --git a/src/core/ns_help.c b/src/core/ns_help.c index 0de4764ac..4f987795d 100644 --- a/src/core/ns_help.c +++ b/src/core/ns_help.c @@ -17,33 +17,22 @@ int do_help(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSHelp : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSHelp(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - - return MOD_CONT; -} + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ + c = createCommand("HELP", do_help, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + } +}; -} /** * The /ns help command. @@ -78,4 +67,4 @@ int do_help(User * u) /* EOF */ -MODULE_INIT("ns_help") +MODULE_INIT(NSHelp) diff --git a/src/core/ns_identify.c b/src/core/ns_identify.c index 2fe223222..5e415459d 100644 --- a/src/core/ns_identify.c +++ b/src/core/ns_identify.c @@ -21,42 +21,29 @@ int do_identify(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) -{ - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("IDENTIFY", do_identify, NULL, NICK_HELP_IDENTIFY, - -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SIDENTIFY", do_identify, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); +class NSIdentify : public Module +{ + public: + NSIdentify(const std::string &creator) : Module(creator) + { + Command *c; - moduleSetNickHelp(myNickServHelp); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - return MOD_CONT; -} + c = createCommand("ID", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("IDENTIFY", do_identify, NULL, NICK_HELP_IDENTIFY, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SIDENTIFY", do_identify, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ -} + moduleSetNickHelp(myNickServHelp); + } +}; /** * Add the help response to anopes /ns help output. @@ -170,4 +157,4 @@ int do_identify(User * u) return MOD_CONT; } -MODULE_INIT("ns_identify") +MODULE_INIT(NSIdentify) diff --git a/src/core/ns_info.c b/src/core/ns_info.c index 829ff826d..f75675085 100644 --- a/src/core/ns_info.c +++ b/src/core/ns_info.c @@ -18,38 +18,25 @@ static int do_info(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSInfo : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion - ("$Id$"); - moduleSetType(CORE); + public: + NSInfo(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1, - NICK_HELP_INFO, NICK_SERVADMIN_HELP_INFO, - NICK_SERVADMIN_HELP_INFO); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion + ("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("INFO", do_info, NULL, NICK_HELP_INFO, -1, NICK_HELP_INFO, NICK_SERVADMIN_HELP_INFO, NICK_SERVADMIN_HELP_INFO); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ + moduleSetNickHelp(myNickServHelp); + } +}; -} @@ -283,4 +270,4 @@ int do_info(User * u) return MOD_CONT; } -MODULE_INIT("ns_info") +MODULE_INIT(NSInfo) diff --git a/src/core/ns_list.c b/src/core/ns_list.c index a9984c79b..9203eb99e 100644 --- a/src/core/ns_list.c +++ b/src/core/ns_list.c @@ -18,37 +18,24 @@ int do_list(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSList : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSList(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, - NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("LIST", do_list, NULL, -1, NICK_HELP_LIST, -1, NICK_SERVADMIN_HELP_LIST, NICK_SERVADMIN_HELP_LIST); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -246,4 +233,4 @@ int do_list(User * u) return MOD_CONT; } -MODULE_INIT("ns_list") +MODULE_INIT(NSList) diff --git a/src/core/ns_logout.c b/src/core/ns_logout.c index d8e6eb0da..f55294472 100644 --- a/src/core/ns_logout.c +++ b/src/core/ns_logout.c @@ -21,37 +21,23 @@ int do_logout(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSLogout : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSLogout(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, - NICK_SERVADMIN_HELP_LOGOUT, - NICK_SERVADMIN_HELP_LOGOUT); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("LOGOUT", do_logout, NULL, -1, NICK_HELP_LOGOUT, -1, NICK_SERVADMIN_HELP_LOGOUT, NICK_SERVADMIN_HELP_LOGOUT); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -127,4 +113,4 @@ int do_logout(User * u) return MOD_CONT; } -MODULE_INIT("ns_logout") +MODULE_INIT(NSLogout) diff --git a/src/core/ns_recover.c b/src/core/ns_recover.c index 6f3f3c3ef..80a679b37 100644 --- a/src/core/ns_recover.c +++ b/src/core/ns_recover.c @@ -21,34 +21,23 @@ int do_recover(User * u); void myNickServHelp(User * u); int myHelpResonse(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSRecover : public Module { - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - moduleAddHelp(c, myHelpResonse); + public: + NSRecover(const std::string &creator) : Module(creator) + { + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("RECOVER", do_recover, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddHelp(c, myHelpResonse); -/** - * Unload the module - **/ -void AnopeFini(void) -{ + moduleSetNickHelp(myNickServHelp); + } +}; -} /** * Add the help response to anopes /ns help output. @@ -136,4 +125,4 @@ int do_recover(User * u) /* EOF */ -MODULE_INIT("ns_recover") +MODULE_INIT(NSRecover) diff --git a/src/core/ns_register.c b/src/core/ns_register.c index 77e68acd5..9d673db36 100644 --- a/src/core/ns_register.c +++ b/src/core/ns_register.c @@ -25,43 +25,30 @@ NickAlias *makenick(const char *nick); int do_sendregmail(User * u, NickRequest * nr); int ns_do_register(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSRegister : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSRegister(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, - -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - c = createCommand("CONFIRM", do_confirm, NULL, NICK_HELP_CONFIRM, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("REGISTER", do_register, NULL, NICK_HELP_REGISTER, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("RESEND", do_resend, NULL, NICK_HELP_RESEND, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("CONFIRM", do_confirm, NULL, NICK_HELP_CONFIRM, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("RESEND", do_resend, NULL, NICK_HELP_RESEND, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -490,4 +477,4 @@ int do_sendregmail(User * u, NickRequest * nr) } -MODULE_INIT("ns_register") +MODULE_INIT(NSRegister) diff --git a/src/core/ns_release.c b/src/core/ns_release.c index 5bb200907..4d64f9d8f 100644 --- a/src/core/ns_release.c +++ b/src/core/ns_release.c @@ -21,34 +21,23 @@ int do_release(User * u); void myNickServHelp(User * u); int myHelpResonse(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSRelease : public Module { - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - moduleAddHelp(c, myHelpResonse); + public: + NSRelease(const std::string &creator) : Module(creator) + { + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("RELEASE", do_release, NULL, -1, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddHelp(c, myHelpResonse); -/** - * Unload the module - **/ -void AnopeFini(void) -{ + moduleSetNickHelp(myNickServHelp); + } +}; -} @@ -126,4 +115,4 @@ int do_release(User * u) /* EOF */ -MODULE_INIT("ns_release") +MODULE_INIT(NSRelease) diff --git a/src/core/ns_saset.c b/src/core/ns_saset.c index 9383c5c52..beae6d95c 100644 --- a/src/core/ns_saset.c +++ b/src/core/ns_saset.c @@ -33,80 +33,51 @@ int do_saset_autoop(User * u, NickCore * nc, char *param); int do_saset_language(User * u, NickCore * nc, char *param); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) -{ - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $"); - moduleSetType(CORE); - - c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, - NICK_HELP_SASET, NICK_HELP_SASET); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET DISPLAY", NULL, is_services_oper, - NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET PASSWORD", NULL, is_services_oper, - NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET URL", NULL, is_services_oper, - NICK_HELP_SASET_URL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET EMAIL", NULL, is_services_oper, - NICK_HELP_SASET_EMAIL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET ICQ", NULL, is_services_oper, - NICK_HELP_SASET_ICQ, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET GREET", NULL, is_services_oper, - NICK_HELP_SASET_GREET, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET KILL", NULL, is_services_oper, - NICK_HELP_SASET_KILL, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET SECURE", NULL, is_services_oper, - NICK_HELP_SASET_SECURE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET PRIVATE", NULL, is_services_oper, - NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET MSG", NULL, is_services_oper, - NICK_HELP_SASET_MSG, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET HIDE", NULL, is_services_oper, - NICK_HELP_SASET_HIDE, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET NOEXPIRE", NULL, is_services_oper, -1, -1, - -1, NICK_HELP_SASET_NOEXPIRE, - NICK_HELP_SASET_NOEXPIRE); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET AUTOOP", NULL, is_services_oper, -1, -1, - -1, NICK_HELP_SASET_AUTOOP, - NICK_HELP_SASET_AUTOOP); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SASET LANGUAGE", NULL, is_services_oper, - -1, -1, -1, -1, NICK_HELP_SASET_LANGUAGE); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} - -/** - * Unload the module - **/ -void AnopeFini(void) +class NSSASet : public Module { - -} + public: + NSSASet(const std::string &creator) : Module(creator) + { + Command *c; + + moduleAddAuthor("Anope"); + moduleAddVersion("$Id: ns_set.c 850 2005-08-07 14:52:04Z geniusdex $"); + moduleSetType(CORE); + + c = createCommand("SASET", do_saset, is_services_oper, -1, -1, -1, NICK_HELP_SASET, NICK_HELP_SASET); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET DISPLAY", NULL, is_services_oper, NICK_HELP_SASET_DISPLAY, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET PASSWORD", NULL, is_services_oper, NICK_HELP_SASET_PASSWORD, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET URL", NULL, is_services_oper, NICK_HELP_SASET_URL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET EMAIL", NULL, is_services_oper, NICK_HELP_SASET_EMAIL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET ICQ", NULL, is_services_oper, NICK_HELP_SASET_ICQ, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET GREET", NULL, is_services_oper, NICK_HELP_SASET_GREET, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET KILL", NULL, is_services_oper, NICK_HELP_SASET_KILL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET SECURE", NULL, is_services_oper, NICK_HELP_SASET_SECURE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET PRIVATE", NULL, is_services_oper, NICK_HELP_SASET_PRIVATE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET MSG", NULL, is_services_oper, NICK_HELP_SASET_MSG, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET HIDE", NULL, is_services_oper, NICK_HELP_SASET_HIDE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET NOEXPIRE", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_NOEXPIRE, NICK_HELP_SASET_NOEXPIRE); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET AUTOOP", NULL, is_services_oper, -1, -1, -1, NICK_HELP_SASET_AUTOOP, NICK_HELP_SASET_AUTOOP); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SASET LANGUAGE", NULL, is_services_oper, -1, -1, -1, -1, NICK_HELP_SASET_LANGUAGE); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + + moduleSetNickHelp(myNickServHelp); + } +}; @@ -532,4 +503,4 @@ int do_saset_language(User * u, NickCore * nc, char *param) /* EOF */ -MODULE_INIT("ns_saset") +MODULE_INIT(NSSASet) diff --git a/src/core/ns_sendpass.c b/src/core/ns_sendpass.c index 7ea1c35d3..64039b731 100644 --- a/src/core/ns_sendpass.c +++ b/src/core/ns_sendpass.c @@ -19,39 +19,27 @@ int do_sendpass(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSSendPass : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, - -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - - moduleSetNickHelp(myNickServHelp); - if (!UseMail) { - return MOD_STOP; - } - - return MOD_CONT; -} - -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + public: + NSSendPass(const std::string &creator) : Module(creator) + { + Command *c; + + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); + + c = createCommand("SENDPASS", do_sendpass, NULL, NICK_HELP_SENDPASS, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + + moduleSetNickHelp(myNickServHelp); + if (!UseMail) + { + throw ModuleException("Not using mail, whut."); + } + } +}; /** * Add the help response to anopes /ns help output. @@ -121,4 +109,4 @@ int do_sendpass(User * u) return MOD_CONT; } -MODULE_INIT("ns_sendpass") +MODULE_INIT(NSSendPass) diff --git a/src/core/ns_set.c b/src/core/ns_set.c index 61b28c99d..b7423c639 100644 --- a/src/core/ns_set.c +++ b/src/core/ns_set.c @@ -32,71 +32,47 @@ int do_set_hide(User * u, NickCore * nc, char *param); int do_set_autoop(User *u, NickCore *nc, char *param); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSSet : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); - - c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET DISPLAY", NULL, NULL, NICK_HELP_SET_DISPLAY, -1, - -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET PASSWORD", NULL, NULL, NICK_HELP_SET_PASSWORD, - -1, -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET URL", NULL, NULL, NICK_HELP_SET_URL, -1, -1, -1, - -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET EMAIL", NULL, NULL, NICK_HELP_SET_EMAIL, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET ICQ", NULL, NULL, NICK_HELP_SET_ICQ, -1, -1, -1, - -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET GREET", NULL, NULL, NICK_HELP_SET_GREET, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET KILL", NULL, NULL, NICK_HELP_SET_KILL, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET SECURE", NULL, NULL, NICK_HELP_SET_SECURE, -1, - -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET PRIVATE", NULL, NULL, NICK_HELP_SET_PRIVATE, -1, - -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET MSG", NULL, NULL, NICK_HELP_SET_MSG, -1, -1, -1, - -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET HIDE", NULL, NULL, NICK_HELP_SET_HIDE, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("SET AUTOOP", NULL, NULL, NICK_HELP_SET_AUTOOP, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} - -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + public: + NSSet(const std::string &creator) : Module(creator) + { + Command *c; + + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); + + c = createCommand("SET", do_set, NULL, NICK_HELP_SET, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET DISPLAY", NULL, NULL, NICK_HELP_SET_DISPLAY, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET PASSWORD", NULL, NULL, NICK_HELP_SET_PASSWORD, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET URL", NULL, NULL, NICK_HELP_SET_URL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET EMAIL", NULL, NULL, NICK_HELP_SET_EMAIL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET ICQ", NULL, NULL, NICK_HELP_SET_ICQ, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET GREET", NULL, NULL, NICK_HELP_SET_GREET, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET KILL", NULL, NULL, NICK_HELP_SET_KILL, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET SECURE", NULL, NULL, NICK_HELP_SET_SECURE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET PRIVATE", NULL, NULL, NICK_HELP_SET_PRIVATE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET MSG", NULL, NULL, NICK_HELP_SET_MSG, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET HIDE", NULL, NULL, NICK_HELP_SET_HIDE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("SET AUTOOP", NULL, NULL, NICK_HELP_SET_AUTOOP, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + + moduleSetNickHelp(myNickServHelp); + } +}; @@ -474,4 +450,4 @@ int do_set_autoop(User *u, NickCore *nc, char *param) { /* EOF */ -MODULE_INIT("ns_set") +MODULE_INIT(NSSet) diff --git a/src/core/ns_status.c b/src/core/ns_status.c index 7ef91b6f8..19d32fdb9 100644 --- a/src/core/ns_status.c +++ b/src/core/ns_status.c @@ -18,36 +18,23 @@ int do_status(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSStatus : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSStatus(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, - -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("STATUS", do_status, NULL, NICK_HELP_STATUS, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; /** * Add the help response to anopes /ns help output. @@ -93,4 +80,4 @@ int do_status(User * u) return MOD_CONT; } -MODULE_INIT("ns_status") +MODULE_INIT(NSStatus) diff --git a/src/core/ns_suspend.c b/src/core/ns_suspend.c index 7394015d4..83e1d74d8 100644 --- a/src/core/ns_suspend.c +++ b/src/core/ns_suspend.c @@ -19,41 +19,25 @@ int do_suspend(User * u); int do_unsuspend(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSSuspend : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSSuspend(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, - NICK_SERVADMIN_HELP_SUSPEND, - NICK_SERVADMIN_HELP_SUSPEND); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); - c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, - -1, NICK_SERVADMIN_HELP_UNSUSPEND, - NICK_SERVADMIN_HELP_UNSUSPEND); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("SUSPEND", do_suspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_SUSPEND, NICK_SERVADMIN_HELP_SUSPEND); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + c = createCommand("UNSUSPEND", do_unsuspend, is_services_oper, -1, -1, -1, NICK_SERVADMIN_HELP_UNSUSPEND, NICK_SERVADMIN_HELP_UNSUSPEND); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; /** * Add the help response to anopes /ns help output. @@ -192,4 +176,4 @@ int do_unsuspend(User * u) } -MODULE_INIT("ns_suspend") +MODULE_INIT(NSSuspend) diff --git a/src/core/ns_update.c b/src/core/ns_update.c index 6724cdafa..8305de0cf 100644 --- a/src/core/ns_update.c +++ b/src/core/ns_update.c @@ -18,36 +18,23 @@ int do_nickupdate(User * u); void myNickServHelp(User * u); -/** - * Create the command, and tell anope about it. - * @param argc Argument count - * @param argv Argument list - * @return MOD_CONT to allow the module, MOD_STOP to stop it - **/ -int AnopeInit(int argc, char **argv) +class NSUpdate : public Module { - Command *c; - - moduleAddAuthor("Anope"); - moduleAddVersion("$Id$"); - moduleSetType(CORE); + public: + NSUpdate(const std::string &creator) : Module(creator) + { + Command *c; - c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, - -1, -1, -1); - moduleAddCommand(NICKSERV, c, MOD_UNIQUE); + moduleAddAuthor("Anope"); + moduleAddVersion("$Id$"); + moduleSetType(CORE); - moduleSetNickHelp(myNickServHelp); - - return MOD_CONT; -} + c = createCommand("UPDATE", do_nickupdate, NULL, NICK_HELP_UPDATE, -1, -1, -1, -1); + moduleAddCommand(NICKSERV, c, MOD_UNIQUE); -/** - * Unload the module - **/ -void AnopeFini(void) -{ - -} + moduleSetNickHelp(myNickServHelp); + } +}; @@ -89,4 +76,4 @@ int do_nickupdate(User * u) return MOD_CONT; } -MODULE_INIT("ns_update") +MODULE_INIT(NSUpdate) |