diff options
| author | Adam <Adam@anope.org> | 2010-08-17 19:27:37 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2010-08-17 19:27:37 -0400 |
| commit | e65d8b2f3dfdb40858259b3bb48ef6998c31e62f (patch) | |
| tree | fd845bdef5664d025ab19c262ae2c5e9d23d7bb2 /modules/core/ns_set_kill.cpp | |
| parent | 2575008baa5c9d0ca789680da1a3b81dc74786f7 (diff) | |
Rewrote the config reader to better handle invalid configs.
This prevents Anope from exploding when /os reload has errors.
Diffstat (limited to 'modules/core/ns_set_kill.cpp')
| -rw-r--r-- | modules/core/ns_set_kill.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/core/ns_set_kill.cpp b/modules/core/ns_set_kill.cpp index c85570d87..2a3448232 100644 --- a/modules/core/ns_set_kill.cpp +++ b/modules/core/ns_set_kill.cpp @@ -34,33 +34,33 @@ class CommandNSSetKill : public Command nc->SetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_ON, nc->display.c_str()); + notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_ON, nc->display.c_str()); } else if (param.equals_ci("QUICK")) { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display.c_str()); + notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_QUICK, nc->display.c_str()); } else if (param.equals_ci("IMMED")) { - if (Config.NSAllowKillImmed) + if (Config->NSAllowKillImmed) { nc->SetFlag(NI_KILLPROTECT); nc->SetFlag(NI_KILL_IMMED); nc->UnsetFlag(NI_KILL_QUICK); - notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display.c_str()); + notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_IMMED, nc->display.c_str()); } else - notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED); + notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED); } else if (param.equals_ci("OFF")) { nc->UnsetFlag(NI_KILLPROTECT); nc->UnsetFlag(NI_KILL_QUICK); nc->UnsetFlag(NI_KILL_IMMED); - notice_lang(Config.s_NickServ, u, NICK_SASET_KILL_OFF, nc->display.c_str()); + notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_OFF, nc->display.c_str()); } else this->OnSyntaxError(u, "KILL"); @@ -70,18 +70,18 @@ class CommandNSSetKill : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config.s_NickServ, u, NICK_HELP_SET_KILL); + notice_help(Config->s_NickServ, u, NICK_HELP_SET_KILL); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config.s_NickServ, u, "SET KILL", Config.NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX : NICK_SET_KILL_SYNTAX); + syntax_error(Config->s_NickServ, u, "SET KILL", Config->NSAllowKillImmed ? NICK_SET_KILL_IMMED_SYNTAX : NICK_SET_KILL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SET_KILL); + notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_KILL); } }; @@ -94,18 +94,18 @@ class CommandNSSASetKill : public CommandNSSetKill bool OnHelp(User *u, const Anope::string &) { - notice_help(Config.s_NickServ, u, NICK_HELP_SASET_KILL); + notice_help(Config->s_NickServ, u, NICK_HELP_SASET_KILL); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config.s_NickServ, u, "SASET KILL", Config.NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX : NICK_SASET_KILL_SYNTAX); + syntax_error(Config->s_NickServ, u, "SASET KILL", Config->NSAllowKillImmed ? NICK_SASET_KILL_IMMED_SYNTAX : NICK_SASET_KILL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config.s_NickServ, u, NICK_HELP_CMD_SASET_KILL); + notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_KILL); } }; |