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/ms_read.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/ms_read.cpp')
| -rw-r--r-- | modules/core/ms_read.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp index 5f25230e3..80e1d5bf6 100644 --- a/modules/core/ms_read.cpp +++ b/modules/core/ms_read.cpp @@ -38,10 +38,10 @@ class MemoListCallback : public NumberList strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); timebuf[sizeof(timebuf) - 1] = 0; if (ci) - notice_lang(Config.s_MemoServ, u, MEMO_CHAN_HEADER, m->number, m->sender.c_str(), timebuf, Config.s_MemoServ.c_str(), ci->name.c_str(), m->number); + notice_lang(Config->s_MemoServ, u, MEMO_CHAN_HEADER, m->number, m->sender.c_str(), timebuf, Config->s_MemoServ.c_str(), ci->name.c_str(), m->number); else - notice_lang(Config.s_MemoServ, u, MEMO_HEADER, m->number, m->sender.c_str(), timebuf, Config.s_MemoServ.c_str(), m->number); - notice_lang(Config.s_MemoServ, u, MEMO_TEXT, m->text.c_str()); + notice_lang(Config->s_MemoServ, u, MEMO_HEADER, m->number, m->sender.c_str(), timebuf, Config->s_MemoServ.c_str(), m->number); + notice_lang(Config->s_MemoServ, u, MEMO_TEXT, m->text.c_str()); m->UnsetFlag(MF_UNREAD); /* Check if a receipt notification was requested */ @@ -71,12 +71,12 @@ class CommandMSRead : public Command if (!(ci = cs_findchan(chan))) { - notice_lang(Config.s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(Config.s_MemoServ, u, ACCESS_DENIED); + notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -89,9 +89,9 @@ class CommandMSRead : public Command else if (mi->memos.empty()) { if (!chan.empty()) - notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + notice_lang(Config->s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_MEMOS); } else { int i, end; @@ -108,9 +108,9 @@ class CommandMSRead : public Command if (!readcount) { if (!chan.empty()) - notice_lang(Config.s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); + notice_lang(Config->s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); else - notice_lang(Config.s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); + notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); } } else if (numstr.equals_ci("LAST")) @@ -129,18 +129,18 @@ class CommandMSRead : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config.s_MemoServ, u, MEMO_HELP_READ); + notice_help(Config->s_MemoServ, u, MEMO_HELP_READ); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config.s_MemoServ, u, "READ", MEMO_READ_SYNTAX); + syntax_error(Config->s_MemoServ, u, "READ", MEMO_READ_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config.s_MemoServ, u, MEMO_HELP_CMD_READ); + notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_READ); } }; |