From a08b3ec5924c946308ac086cd3ee7d701610d3be Mon Sep 17 00:00:00 2001 From: Adam- Date: Sat, 28 Nov 2009 23:02:07 +0000 Subject: Massive move of all of the Config variables out of global scope to the Config class git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2674 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/bs_act.c | 18 ++--- src/core/bs_assign.c | 18 ++--- src/core/bs_badwords.c | 44 +++++------ src/core/bs_bot.c | 82 ++++++++++---------- src/core/bs_botlist.c | 18 ++--- src/core/bs_help.c | 6 +- src/core/bs_info.c | 82 ++++++++++---------- src/core/bs_kick.c | 100 ++++++++++++------------- src/core/bs_say.c | 18 ++--- src/core/bs_set.c | 74 +++++++++--------- src/core/bs_unassign.c | 16 ++-- src/core/cs_access.c | 138 +++++++++++++++++----------------- src/core/cs_akick.c | 82 ++++++++++---------- src/core/cs_ban.c | 34 ++++----- src/core/cs_clear.c | 42 +++++------ src/core/cs_drop.c | 24 +++--- src/core/cs_forbid.c | 30 ++++---- src/core/cs_getkey.c | 12 +-- src/core/cs_help.c | 14 ++-- src/core/cs_info.c | 50 ++++++------- src/core/cs_invite.c | 16 ++-- src/core/cs_kick.c | 20 ++--- src/core/cs_list.c | 36 ++++----- src/core/cs_modes.c | 74 +++++++++--------- src/core/cs_register.c | 40 +++++----- src/core/cs_set.c | 190 +++++++++++++++++++++++------------------------ src/core/cs_status.c | 12 +-- src/core/cs_suspend.c | 54 +++++++------- src/core/cs_topic.c | 22 +++--- src/core/cs_xop.c | 94 +++++++++++------------ src/core/enc_md5.c | 2 +- src/core/enc_none.c | 2 +- src/core/enc_old.c | 2 +- src/core/enc_sha1.c | 2 +- src/core/hs_del.c | 12 +-- src/core/hs_delall.c | 12 +-- src/core/hs_group.c | 10 +-- src/core/hs_help.c | 4 +- src/core/hs_list.c | 32 ++++---- src/core/hs_off.c | 8 +- src/core/hs_on.c | 10 +-- src/core/hs_set.c | 26 +++---- src/core/hs_setall.c | 26 +++---- src/core/ms_cancel.c | 16 ++-- src/core/ms_check.c | 18 ++--- src/core/ms_del.c | 30 ++++---- src/core/ms_help.c | 6 +- src/core/ms_info.c | 80 ++++++++++---------- src/core/ms_list.c | 26 +++---- src/core/ms_read.c | 28 +++---- src/core/ms_rsend.c | 22 +++--- src/core/ms_send.c | 6 +- src/core/ms_sendall.c | 10 +-- src/core/ms_set.c | 72 +++++++++--------- src/core/ms_staff.c | 8 +- src/core/ns_access.c | 42 +++++------ src/core/ns_alist.c | 20 ++--- src/core/ns_drop.c | 40 +++++----- src/core/ns_forbid.c | 30 ++++---- src/core/ns_getemail.c | 12 +-- src/core/ns_getpass.c | 32 ++++---- src/core/ns_ghost.c | 30 ++++---- src/core/ns_group.c | 82 ++++++++++---------- src/core/ns_help.c | 16 ++-- src/core/ns_identify.c | 36 ++++----- src/core/ns_info.c | 66 ++++++++-------- src/core/ns_list.c | 34 ++++----- src/core/ns_logout.c | 18 ++--- src/core/ns_recover.c | 44 +++++------ src/core/ns_register.c | 126 +++++++++++++++---------------- src/core/ns_release.c | 30 ++++---- src/core/ns_saset.c | 168 ++++++++++++++++++++--------------------- src/core/ns_sendpass.c | 26 +++---- src/core/ns_set.c | 142 +++++++++++++++++------------------ src/core/ns_status.c | 14 ++-- src/core/ns_suspend.c | 56 +++++++------- src/core/ns_update.c | 6 +- src/core/os_akill.c | 68 ++++++++--------- src/core/os_chankill.c | 20 ++--- src/core/os_chanlist.c | 14 ++-- src/core/os_clearmodes.c | 46 ++++++------ src/core/os_defcon.c | 146 ++++++++++++++++++------------------ src/core/os_global.c | 10 +-- src/core/os_help.c | 6 +- src/core/os_ignore.c | 24 +++--- src/core/os_jupe.c | 14 ++-- src/core/os_kick.c | 18 ++--- src/core/os_mode.c | 18 ++--- src/core/os_modinfo.c | 12 +-- src/core/os_modlist.c | 22 +++--- src/core/os_modload.c | 10 +-- src/core/os_modunload.c | 10 +-- src/core/os_news.c | 60 +++++++-------- src/core/os_noop.c | 16 ++-- src/core/os_oline.c | 22 +++--- src/core/os_quit.c | 8 +- src/core/os_reload.c | 6 +- src/core/os_restart.c | 8 +- src/core/os_session.c | 80 ++++++++++---------- src/core/os_set.c | 96 ++++++++++++------------ src/core/os_sgline.c | 60 +++++++-------- src/core/os_shutdown.c | 8 +- src/core/os_sqline.c | 62 ++++++++-------- src/core/os_staff.c | 16 ++-- src/core/os_stats.c | 144 +++++++++++++++++------------------ src/core/os_svsnick.c | 22 +++--- src/core/os_szline.c | 60 +++++++-------- src/core/os_umode.c | 18 ++--- src/core/os_update.c | 6 +- src/core/os_userlist.c | 14 ++-- src/core/ss_main.c | 2 +- 111 files changed, 2072 insertions(+), 2074 deletions(-) (limited to 'src/core') diff --git a/src/core/bs_act.c b/src/core/bs_act.c index c30c8f62d..e321c37a9 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -29,19 +29,19 @@ class CommandBSAct : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); return MOD_CONT; } - if (!ci->c || ci->c->usercount < BSMinUsers) + if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); return MOD_CONT; } @@ -51,19 +51,19 @@ class CommandBSAct : public Command ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); ci->bi->lastmsg = time(NULL); - if (LogBot && LogChannel && LogChan && !debug && findchan(LogChannel)) - ircdproto->SendPrivmsg(ci->bi, LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); + if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "ACT", BOT_ACT_SYNTAX); + syntax_error(Config.s_BotServ, u, "ACT", BOT_ACT_SYNTAX); } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_ACT); + notice_help(Config.s_BotServ, u, BOT_HELP_ACT); return true; } }; @@ -82,7 +82,7 @@ class BSAct : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_ACT); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_ACT); } }; diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 10d224b8e..30b7ef647 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -31,13 +31,13 @@ class CommandBSAssign : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_READONLY); return MOD_CONT; } if (!(bi = findbot(nick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } @@ -45,36 +45,36 @@ class CommandBSAssign : public Command if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->nc->HasPriv("botserv/administration"))) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (bi->HasFlag(BI_PRIVATE) && !u->nc->HasCommand("botserv/assign/private")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0)) { - notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); return MOD_CONT; } bi->Assign(u, ci); - notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_ASSIGN); + notice_help(Config.s_BotServ, u, BOT_HELP_ASSIGN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); + syntax_error(Config.s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); } }; @@ -92,7 +92,7 @@ class BSAssign : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_ASSIGN); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_ASSIGN); } }; diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 6709dab0e..06f4eedd0 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -28,7 +28,7 @@ class CommandBSBadwords : public Command if (!ci->GetBadWordCount()) { - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); return MOD_CONT; } if (!word.empty() && strspn(word.c_str(), "1234567890,-") == word.length()) @@ -48,7 +48,7 @@ class CommandBSBadwords : public Command } } if (!sent_header) - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); return MOD_CONT; } @@ -74,9 +74,9 @@ class CommandBSBadwords : public Command realword = ci::string(word, 0, pos); } - if (ci->GetBadWordCount() >= BSBadWordsMax) + if (ci->GetBadWordCount() >= Config.BSBadWordsMax) { - notice_lang(s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT, BSBadWordsMax); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT, Config.BSBadWordsMax); return MOD_CONT; } @@ -84,17 +84,17 @@ class CommandBSBadwords : public Command { BadWord *bw = ci->GetBadWord(i); - if (!bw->word.empty() && (BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) - || (!BSCaseSensitive && bw->word == realword.c_str()))) + if (!bw->word.empty() && (Config.BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) + || (!Config.BSCaseSensitive && bw->word == realword.c_str()))) { - notice_lang(s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); return MOD_CONT; } } ci->AddBadWord(realword.c_str(), type); - notice_lang(s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); return MOD_CONT; } @@ -111,20 +111,20 @@ class CommandBSBadwords : public Command { if (count == 1) { - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); } else { - notice_lang(s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); } } else if (deleted == 1) { - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); } else { - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); } if (deleted) @@ -145,13 +145,13 @@ class CommandBSBadwords : public Command if (i == ci->GetBadWordCount()) { - notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); return MOD_CONT; } ci->EraseBadWord(badword); - notice_lang(s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); } return MOD_CONT; @@ -160,7 +160,7 @@ class CommandBSBadwords : public Command CommandReturn DoClear(User *u, ChannelInfo *ci) { ci->ClearBadWords(); - notice_lang(s_BotServ, u, BOT_BADWORDS_CLEAR); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_CLEAR); return MOD_CONT; } public: @@ -186,13 +186,13 @@ class CommandBSBadwords : public Command if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->nc->HasPriv("botserv/administration"))) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (readonly) { - notice_lang(s_BotServ, u, BOT_BADWORDS_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DISABLED); return MOD_CONT; } @@ -212,13 +212,13 @@ class CommandBSBadwords : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_BADWORDS); + notice_help(Config.s_BotServ, u, BOT_HELP_BADWORDS); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); + syntax_error(Config.s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); } }; @@ -236,7 +236,7 @@ class BSBadwords : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BADWORDS); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BADWORDS); } }; @@ -261,11 +261,11 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); *sent_header = 1; } - notice_lang(s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1, bw->word.c_str(), + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, index + 1, bw->word.c_str(), ((bw->type == BW_SINGLE) ? "(SINGLE)" : ((bw->type == BW_START) ? "(START)" : ((bw->type == BW_END) ? "(END)" : ""))) ); diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index cba750cbe..2c0195ee4 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -29,32 +29,32 @@ class CommandBSBot : public Command if (findbot(nick)) { - notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); return MOD_CONT; } - if (strlen(nick) > NickLen) + if (strlen(nick) > Config.NickLen) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (strlen(user) >= USERMAX) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } if (strlen(user) > HOSTMAX) { - notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); + notice_lang(Config.s_BotServ, u, BOT_LONG_HOST, HOSTMAX); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } @@ -62,7 +62,7 @@ class CommandBSBot : public Command { if (!isvalidnick(*ch)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } } @@ -70,14 +70,14 @@ class CommandBSBot : public Command /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } /* Check the host is valid re RFC 2812 */ if (!isValidHost(host, 3)) { - notice_lang(s_BotServ, u, BOT_BAD_HOST); + notice_lang(Config.s_BotServ, u, BOT_BAD_HOST); return MOD_CONT; } @@ -85,7 +85,7 @@ class CommandBSBot : public Command { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } @@ -97,20 +97,20 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED, nick); + notice_lang(Config.s_BotServ, u, NICK_ALREADY_REGISTERED, nick); return MOD_CONT; } if (!(bi = new BotInfo(nick, user, host, real))) { - notice_lang(s_BotServ, u, BOT_BOT_CREATION_FAILED); + notice_lang(Config.s_BotServ, u, BOT_BOT_CREATION_FAILED); return MOD_CONT; } /* We check whether user with this nick is online, and kill it if so */ - EnforceQlinedNick(nick, s_BotServ); + EnforceQlinedNick(nick, Config.s_BotServ); - notice_lang(s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, + notice_lang(Config.s_BotServ, u, BOT_BOT_ADDED, bi->nick, bi->user, bi->host, bi->real); FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi)); @@ -135,37 +135,37 @@ class CommandBSBot : public Command if (!(bi = findbot(oldnick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } if (stricmp(oldnick, nick) && nickIsServices(oldnick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } - if (strlen(nick) > NickLen) + if (strlen(nick) > Config.NickLen) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (user && strlen(user) >= USERMAX) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } if (host && strlen(host) > HOSTMAX) { - notice_lang(s_BotServ, u, BOT_LONG_HOST, HOSTMAX); + notice_lang(Config.s_BotServ, u, BOT_LONG_HOST, HOSTMAX); return MOD_CONT; } if (stricmp(oldnick, nick) && nickIsServices(nick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick); return MOD_CONT; } @@ -179,14 +179,14 @@ class CommandBSBot : public Command && ((host) ? !strcmp(bi->host, host) : 1) && ((real) ? !strcmp(bi->real, real) : 1)) { - notice_lang(s_BotServ, u, BOT_BOT_ANY_CHANGES); + notice_lang(Config.s_BotServ, u, BOT_BOT_ANY_CHANGES); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } @@ -194,7 +194,7 @@ class CommandBSBot : public Command { if (!isvalidnick(*ch)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } } @@ -202,13 +202,13 @@ class CommandBSBot : public Command /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(s_BotServ, u, BOT_BAD_NICK); + notice_lang(Config.s_BotServ, u, BOT_BAD_NICK); return MOD_CONT; } if (host && !isValidHost(host, 3)) { - notice_lang(s_BotServ, u, BOT_BAD_HOST); + notice_lang(Config.s_BotServ, u, BOT_BAD_HOST); return MOD_CONT; } @@ -218,7 +218,7 @@ class CommandBSBot : public Command { if (!isalnum(*ch)) { - notice_lang(s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); + notice_lang(Config.s_BotServ, u, BOT_LONG_IDENT, USERMAX - 1); return MOD_CONT; } } @@ -226,7 +226,7 @@ class CommandBSBot : public Command if (stricmp(bi->nick, nick) && findbot(nick)) { - notice_lang(s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick); return MOD_CONT; } @@ -238,7 +238,7 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(s_BotServ, u, NICK_ALREADY_REGISTERED, nick); + notice_lang(Config.s_BotServ, u, NICK_ALREADY_REGISTERED, nick); return MOD_CONT; } @@ -250,7 +250,7 @@ class CommandBSBot : public Command } /* We check whether user with this nick is online, and kill it if so */ - EnforceQlinedNick(nick, s_BotServ); + EnforceQlinedNick(nick, Config.s_BotServ); } if (user) @@ -290,7 +290,7 @@ class CommandBSBot : public Command bi->RejoinAll(); } - notice_lang(s_BotServ, u, BOT_BOT_CHANGED, + notice_lang(Config.s_BotServ, u, BOT_BOT_CHANGED, oldnick, bi->nick, bi->user, bi->host, bi->real); FOREACH_MOD(I_OnBotChange, OnBotChange(bi)); @@ -310,13 +310,13 @@ class CommandBSBot : public Command if (!(bi = findbot(nick))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } if (nickIsServices(nick, 0)) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } @@ -326,7 +326,7 @@ class CommandBSBot : public Command ircdproto->SendSQLineDel(bi->nick); delete bi; - notice_lang(s_BotServ, u, BOT_BOT_DELETED, nick); + notice_lang(Config.s_BotServ, u, BOT_BOT_DELETED, nick); return MOD_CONT; } public: @@ -341,7 +341,7 @@ class CommandBSBot : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_BOT_READONLY); + notice_lang(Config.s_BotServ, u, BOT_BOT_READONLY); return MOD_CONT; } @@ -350,7 +350,7 @@ class CommandBSBot : public Command // ADD nick user host real - 5 if (!u->nc->HasCommand("botserv/bot/add")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -373,7 +373,7 @@ class CommandBSBot : public Command // but only oldn and newn are required if (!u->nc->HasCommand("botserv/bot/change")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -390,7 +390,7 @@ class CommandBSBot : public Command // DEL nick if (!u->nc->HasCommand("botserv/bot/del")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } @@ -410,13 +410,13 @@ class CommandBSBot : public Command bool OnHelp(User *u, const ci::string &subcommand) { - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_BOT); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "BOT", BOT_BOT_SYNTAX); + syntax_error(Config.s_BotServ, u, "BOT", BOT_BOT_SYNTAX); } }; @@ -434,7 +434,7 @@ class BSBot : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BOT); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BOT); } }; diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index 85ed84e17..afc0ba996 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -28,7 +28,7 @@ class CommandBSBotList : public Command BotInfo *bi; if (!nbots) { - notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_EMPTY); return MOD_CONT; } @@ -36,20 +36,20 @@ class CommandBSBotList : public Command for (bi = botlists[i]; bi; bi = bi->next) { if (!(bi->HasFlag(BI_PRIVATE))) { if (!count) - notice_lang(s_BotServ, u, BOT_BOTLIST_HEADER); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_HEADER); count++; - u->SendMessage(s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); + u->SendMessage(Config.s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); } } } if (u->nc->HasCommand("botserv/botlist") && count < nbots) { - notice_lang(s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER); for (i = 0; i < 256; i++) { for (bi = botlists[i]; bi; bi = bi->next) { if (bi->HasFlag(BI_PRIVATE)) { - u->SendMessage(s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); + u->SendMessage(Config.s_BotServ, " %-15s (%s@%s)", bi->nick, bi->user, bi->host); count++; } } @@ -57,15 +57,15 @@ class CommandBSBotList : public Command } if (!count) - notice_lang(s_BotServ, u, BOT_BOTLIST_EMPTY); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_EMPTY); else - notice_lang(s_BotServ, u, BOT_BOTLIST_FOOTER, count); + notice_lang(Config.s_BotServ, u, BOT_BOTLIST_FOOTER, count); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_BOTLIST); + notice_help(Config.s_BotServ, u, BOT_HELP_BOTLIST); return true; } }; @@ -84,7 +84,7 @@ class BSBotList : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_BOTLIST); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_BOTLIST); } }; diff --git a/src/core/bs_help.c b/src/core/bs_help.c index dcf01009c..46e845ee7 100644 --- a/src/core/bs_help.c +++ b/src/core/bs_help.c @@ -26,16 +26,16 @@ class CommandBSHelp : public Command CommandReturn Execute(User *u, const std::vector ¶ms) { - mod_help_cmd(s_BotServ, u, BOTSERV, params[0].c_str()); + mod_help_cmd(Config.s_BotServ, u, BOTSERV, params[0].c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const ci::string &subcommand) { // Abuse syntax error to display general list help. - notice_help(s_BotServ, u, BOT_HELP); + notice_help(Config.s_BotServ, u, BOT_HELP); FOREACH_MOD(I_OnBotServHelp, OnBotServHelp(u)); - notice_help(s_BotServ, u, BOT_HELP_FOOTER, BSMinUsers); + notice_help(Config.s_BotServ, u, BOT_HELP_FOOTER, Config.BSMinUsers); } }; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 82755fe32..2f2afb2d8 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -31,7 +31,7 @@ class CommandBSInfo : public Command for (ci = chanlists[i]; ci; ci = ci->next) { if (ci->bi == bi) { if (strlen(buf) + strlen(ci->name) > 300) { - u->SendMessage(s_BotServ, "%s", buf); + u->SendMessage(Config.s_BotServ, "%s", buf); *buf = 0; end = buf; } @@ -43,7 +43,7 @@ class CommandBSInfo : public Command } if (*buf) - u->SendMessage(s_BotServ, "%s", buf); + u->SendMessage(Config.s_BotServ, "%s", buf); return; } public: @@ -66,14 +66,14 @@ class CommandBSInfo : public Command { struct tm *tm; - notice_lang(s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick); - notice_lang(s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host); - notice_lang(s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_MASK, bi->user, bi->host); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->real); tm = localtime(&bi->created); strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(s_BotServ, u, BOT_INFO_BOT_CREATED, buf); - notice_lang(s_BotServ, u, BOT_INFO_BOT_OPTIONS, getstring(u, (bi->HasFlag(BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE : BOT_INFO_OPT_NONE))); - notice_lang(s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_CREATED, buf); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_OPTIONS, getstring(u, (bi->HasFlag(BI_PRIVATE) ? BOT_INFO_OPT_PRIVATE : BOT_INFO_OPT_NONE))); + notice_lang(Config.s_BotServ, u, BOT_INFO_BOT_USAGE, bi->chancount); if (u->nc->HasPriv("botserv/administration")) this->send_bot_channels(u, bi); @@ -82,109 +82,109 @@ class CommandBSInfo : public Command { if (!IsFounder(u, ci) && !u->nc->HasPriv("botserv/administration")) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } - notice_lang(s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); if (ci->bi) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_BOT_NONE); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT_NONE); if (ci->botflags.HasFlag(BS_KICK_BADWORDS)) { if (ci->ttb[TTB_BADWORDS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BADWORDS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_BOLDS)) { if (ci->ttb[TTB_BOLDS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BOLDS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_CAPS)) { if (ci->ttb[TTB_CAPS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON, getstring(u, BOT_INFO_ACTIVE), ci->capsmin, ci->capspercent); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_COLORS)) { if (ci->ttb[TTB_COLORS]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_COLORS]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_FLOOD)) { if (ci->ttb[TTB_FLOOD]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON, getstring(u, BOT_INFO_ACTIVE), ci->floodlines, ci->floodsecs); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_REPEAT)) { if (ci->ttb[TTB_REPEAT]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REPEAT], ci->repeattimes); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON, getstring(u, BOT_INFO_ACTIVE), ci->repeattimes); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_REVERSES)) { if (ci->ttb[TTB_REVERSES]) - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REVERSES]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_INACTIVE)); if (ci->botflags.HasFlag(BS_KICK_UNDERLINES)) { if (ci->ttb[TTB_UNDERLINES]) - notice_lang(s_BotServ, u, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_UNDERLINES]); else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_ACTIVE)); } else - notice_lang(s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_INACTIVE)); end = buf; @@ -224,23 +224,23 @@ class CommandBSInfo : public Command getstring(u, BOT_INFO_OPT_SYMBIOSIS)); need_comma = 1; } - notice_lang(s_BotServ, u, BOT_INFO_CHAN_OPTIONS, + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_OPTIONS, *buf ? buf : getstring(u, BOT_INFO_OPT_NONE)); } else - notice_lang(s_BotServ, u, BOT_INFO_NOT_FOUND, query); + notice_lang(Config.s_BotServ, u, BOT_INFO_NOT_FOUND, query); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_INFO); + notice_help(Config.s_BotServ, u, BOT_HELP_INFO); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "INFO", BOT_INFO_SYNTAX); + syntax_error(Config.s_BotServ, u, "INFO", BOT_INFO_SYNTAX); } }; @@ -258,7 +258,7 @@ class BSInfo : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_INFO); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_INFO); } }; diff --git a/src/core/bs_kick.c b/src/core/bs_kick.c index 97e36005a..daf09350a 100644 --- a/src/core/bs_kick.c +++ b/src/core/bs_kick.c @@ -34,15 +34,15 @@ class CommandBSKick : public Command ChannelInfo *ci = cs_findchan(chan); if (readonly) - notice_lang(s_BotServ, u, BOT_KICK_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_KICK_DISABLED); else if (!chan || option.empty() || value.empty()) - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (value != "ON" && value != "OFF") - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (!check_access(u, ci, CA_SET) && !u->nc->HasPriv("botserv/administration")) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else if (!ci->bi) - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); else { if (option == "BADWORDS") { if (value == "ON") { @@ -59,7 +59,7 @@ class CommandBSKick : public Command } /* reset the value back to 0 - TSL */ ci->ttb[TTB_BADWORDS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else { @@ -67,13 +67,13 @@ class CommandBSKick : public Command } ci->botflags.SetFlag(BS_KICK_BADWORDS); if (ci->ttb[TTB_BADWORDS]) - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN, ci->ttb[TTB_BADWORDS]); else - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BADWORDS); - notice_lang(s_BotServ, u, BOT_KICK_BADWORDS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_BADWORDS_OFF); } } else if (option == "BOLDS") { if (value == "ON") { @@ -86,20 +86,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_BOLDS]); } ci->ttb[TTB_BOLDS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_BOLDS] = 0; ci->botflags.SetFlag(BS_KICK_BOLDS); if (ci->ttb[TTB_BOLDS]) - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_ON_BAN, ci->ttb[TTB_BOLDS]); else - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BOLDS); - notice_lang(s_BotServ, u, BOT_KICK_BOLDS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_BOLDS_OFF); } } else if (option == "CAPS") { if (value == "ON") { @@ -115,7 +115,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_CAPS]); } ci->ttb[TTB_CAPS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -137,15 +137,15 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_CAPS); if (ci->ttb[TTB_CAPS]) - notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_ON_BAN, ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]); else - notice_lang(s_BotServ, u, BOT_KICK_CAPS_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_ON, ci->capsmin, ci->capspercent); } else { ci->botflags.UnsetFlag(BS_KICK_CAPS); - notice_lang(s_BotServ, u, BOT_KICK_CAPS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_CAPS_OFF); } } else if (option == "COLORS") { if (value == "ON") { @@ -158,20 +158,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_COLORS]); } ci->ttb[TTB_COLORS] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_COLORS] = 0; ci->botflags.SetFlag(BS_KICK_COLORS); if (ci->ttb[TTB_COLORS]) - notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_ON_BAN, ci->ttb[TTB_COLORS]); else - notice_lang(s_BotServ, u, BOT_KICK_COLORS_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_COLORS); - notice_lang(s_BotServ, u, BOT_KICK_COLORS_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_COLORS_OFF); } } else if (option == "FLOOD") { if (value == "ON") { @@ -187,7 +187,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_FLOOD]); } ci->ttb[TTB_FLOOD] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -204,20 +204,20 @@ class CommandBSKick : public Command ci->floodsecs = 10; else ci->floodsecs = atol(secs); - if (ci->floodsecs < 1 || ci->floodsecs > BSKeepData) + if (ci->floodsecs < 1 || ci->floodsecs > Config.BSKeepData) ci->floodsecs = 10; ci->botflags.SetFlag(BS_KICK_FLOOD); if (ci->ttb[TTB_FLOOD]) - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_ON_BAN, ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); else - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_ON, ci->floodlines, ci->floodsecs); } else { ci->botflags.UnsetFlag(BS_KICK_FLOOD); - notice_lang(s_BotServ, u, BOT_KICK_FLOOD_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_FLOOD_OFF); } } else if (option == "REPEAT") { if (value == "ON") { @@ -232,7 +232,7 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REPEAT]); } ci->ttb[TTB_REPEAT] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else @@ -247,14 +247,14 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_REPEAT); if (ci->ttb[TTB_REPEAT]) - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_ON_BAN, ci->repeattimes, ci->ttb[TTB_REPEAT]); else - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_ON, + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_ON, ci->repeattimes); } else { ci->botflags.UnsetFlag(BS_KICK_REPEAT); - notice_lang(s_BotServ, u, BOT_KICK_REPEAT_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_REPEAT_OFF); } } else if (option == "REVERSES") { if (value == "ON") { @@ -268,20 +268,20 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_REVERSES]); } ci->ttb[TTB_REVERSES] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_REVERSES] = 0; ci->botflags.SetFlag(BS_KICK_REVERSES); if (ci->ttb[TTB_REVERSES]) - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_ON_BAN, ci->ttb[TTB_REVERSES]); else - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_REVERSES); - notice_lang(s_BotServ, u, BOT_KICK_REVERSES_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_REVERSES_OFF); } } else if (option == "UNDERLINES") { if (value == "ON") { @@ -295,23 +295,23 @@ class CommandBSKick : public Command alog("debug: errno is %d ERANGE %d EINVAL %d ttb %d", errno, ERANGE, EINVAL, ci->ttb[TTB_UNDERLINES]); } ci->ttb[TTB_UNDERLINES] = 0; - notice_lang(s_BotServ, u, BOT_KICK_BAD_TTB, ttb); + notice_lang(Config.s_BotServ, u, BOT_KICK_BAD_TTB, ttb); return MOD_CONT; } } else ci->ttb[TTB_UNDERLINES] = 0; ci->botflags.SetFlag(BS_KICK_UNDERLINES); if (ci->ttb[TTB_UNDERLINES]) - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN, + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN, ci->ttb[TTB_UNDERLINES]); else - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_ON); + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_UNDERLINES); - notice_lang(s_BotServ, u, BOT_KICK_UNDERLINES_OFF); + notice_lang(Config.s_BotServ, u, BOT_KICK_UNDERLINES_OFF); } } else - notice_help(s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str()); + notice_help(Config.s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str()); } return MOD_CONT; } @@ -319,23 +319,23 @@ class CommandBSKick : public Command bool OnHelp(User *u, const ci::string &subcommand) { if (subcommand.empty()) - notice_help(s_BotServ, u, BOT_HELP_KICK); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK); else if (subcommand == "BADWORDS") - notice_help(s_BotServ, u, BOT_HELP_KICK_BADWORDS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_BADWORDS); else if (subcommand == "BOLDS") - notice_help(s_BotServ, u, BOT_HELP_KICK_BOLDS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_BOLDS); else if (subcommand == "CAPS") - notice_help(s_BotServ, u, BOT_HELP_KICK_CAPS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_CAPS); else if (subcommand == "COLORS") - notice_help(s_BotServ, u, BOT_HELP_KICK_COLORS); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_COLORS); else if (subcommand == "FLOOD") - notice_help(s_BotServ, u, BOT_HELP_KICK_FLOOD); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_FLOOD); else if (subcommand == "REPEAT") - notice_help(s_BotServ, u, BOT_HELP_KICK_REPEAT); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_REPEAT); else if (subcommand == "REVERSES") - notice_help(s_BotServ, u, BOT_HELP_KICK_REVERSES); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_REVERSES); else if (subcommand == "UNDERLINES") - notice_help(s_BotServ, u, BOT_HELP_KICK_UNDERLINES); + notice_help(Config.s_BotServ, u, BOT_HELP_KICK_UNDERLINES); else return false; @@ -344,7 +344,7 @@ class CommandBSKick : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + syntax_error(Config.s_BotServ, u, "KICK", BOT_KICK_SYNTAX); } }; @@ -362,7 +362,7 @@ class BSKick : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_KICK); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_KICK); } }; diff --git a/src/core/bs_say.c b/src/core/bs_say.c index b96ae194d..7143da298 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -33,19 +33,19 @@ class CommandBSSay : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); return MOD_CONT; } - if (!ci->c || ci->c->usercount < BSMinUsers) + if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); return MOD_CONT; } @@ -57,20 +57,20 @@ class CommandBSSay : public Command ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text); ci->bi->lastmsg = time(NULL); - if (LogBot && LogChannel && LogChan && !debug && findchan(LogChannel)) - ircdproto->SendPrivmsg(ci->bi, LogChannel, "SAY %s %s %s", u->nick, ci->name, text); + if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick, ci->name, text); return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_SAY); + notice_help(Config.s_BotServ, u, BOT_HELP_SAY); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "SAY", BOT_SAY_SYNTAX); + syntax_error(Config.s_BotServ, u, "SAY", BOT_SAY_SYNTAX); } }; @@ -88,7 +88,7 @@ class BSSay : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_SAY); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SAY); } }; diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 10375fc94..91c69122b 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -32,7 +32,7 @@ class CommandBSSet : public Command if (readonly) { - notice_lang(s_BotServ, u, BOT_SET_DISABLED); + notice_lang(Config.s_BotServ, u, BOT_SET_DISABLED); return MOD_CONT; } @@ -42,76 +42,76 @@ class CommandBSSet : public Command if (!(bi = findbot(chan))) { - notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, chan); + notice_lang(Config.s_BotServ, u, BOT_DOES_NOT_EXIST, chan); return MOD_CONT; } if (value == "ON") { bi->SetFlag(BI_PRIVATE); - notice_lang(s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick); } else if (value == "OFF") { bi->UnsetFlag(BI_PRIVATE); - notice_lang(s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick); + notice_lang(Config.s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick); } else { - syntax_error(s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); + syntax_error(Config.s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); } return MOD_CONT; } else if (!(ci = cs_findchan(chan))) - notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); + notice_lang(Config.s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET)) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else { if (option == "DONTKICKOPS") { if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKOPS); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_ON, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKOPS); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET DONTKICKOPS", + syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); } } else if (option == "DONTKICKVOICES") { if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKVOICES); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKVOICES); - notice_lang(s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, + notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET DONTKICKVOICES", + syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); } } else if (option == "FANTASY") { if (value == "ON") { ci->botflags.SetFlag(BS_FANTASY); - notice_lang(s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_FANTASY); - notice_lang(s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET FANTASY", + syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); } } else if (option == "GREET") { if (value == "ON") { ci->botflags.SetFlag(BS_GREET); - notice_lang(s_BotServ, u, BOT_SET_GREET_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_GREET); - notice_lang(s_BotServ, u, BOT_SET_GREET_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET GREET", + syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); } } else if (u->nc->HasCommand("botserv/set/nobot") && option == "NOBOT") { @@ -119,27 +119,27 @@ class CommandBSSet : public Command ci->botflags.SetFlag(BS_NOBOT); if (ci->bi) ci->bi->UnAssign(u, ci); - notice_lang(s_BotServ, u, BOT_SET_NOBOT_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_NOBOT); - notice_lang(s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET NOBOT", + syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); } } else if (option == "SYMBIOSIS") { if (value == "ON") { ci->botflags.SetFlag(BS_SYMBIOSIS); - notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_SYMBIOSIS); - notice_lang(s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); } else { - syntax_error(s_BotServ, u, "SET SYMBIOSIS", + syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); } } else { - notice_help(s_BotServ, u, BOT_SET_UNKNOWN, option.c_str()); + notice_help(Config.s_BotServ, u, BOT_SET_UNKNOWN, option.c_str()); } } return MOD_CONT; @@ -149,24 +149,24 @@ class CommandBSSet : public Command { if (subcommand.empty()) { - notice_help(s_BotServ, u, BOT_HELP_SET); + notice_help(Config.s_BotServ, u, BOT_HELP_SET); if (u->nc && u->nc->IsServicesOper()) - notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET); + notice_help(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET); } else if (subcommand == "DONTKICKOPS") - notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); else if (subcommand == "DONTKICKVOICES") - notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); else if (subcommand == "FANTASY") - notice_help(s_BotServ, u, BOT_HELP_SET_FANTASY); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_FANTASY); else if (subcommand == "GREET") - notice_help(s_BotServ, u, BOT_HELP_SET_GREET); + notice_help(Config.s_BotServ, u, BOT_HELP_SET_GREET); else if (subcommand == "SYMBIOSIS") - notice_lang(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, s_ChanServ); + notice_lang(Config.s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config.s_ChanServ); else if (subcommand == "NOBOT") - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); else if (subcommand == "PRIVATE") - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); + notice_lang(Config.s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); else return false; @@ -175,7 +175,7 @@ class CommandBSSet : public Command void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "SET", BOT_SET_SYNTAX); + syntax_error(Config.s_BotServ, u, "SET", BOT_SET_SYNTAX); } }; class BSSet : public Module @@ -192,7 +192,7 @@ class BSSet : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_SET); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_SET); } }; diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index bf4b01654..fcd2ee8f1 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -29,30 +29,30 @@ class CommandBSUnassign : public Command ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PERM); if (readonly) - notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_READONLY); else if (!u->nc->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN)) - notice_lang(s_BotServ, u, ACCESS_DENIED); + notice_lang(Config.s_BotServ, u, ACCESS_DENIED); else if (!ci->bi) - notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); + notice_help(Config.s_BotServ, u, BOT_NOT_ASSIGNED); else if (ci->HasFlag(CI_PERSIST) && !cm) - notice_help(s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); + notice_help(Config.s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); else { ci->bi->UnAssign(u, ci); - notice_lang(s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); + notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); } return MOD_CONT; } bool OnHelp(User *u, const ci::string &subcommand) { - notice_help(s_BotServ, u, BOT_HELP_UNASSIGN); + notice_help(Config.s_BotServ, u, BOT_HELP_UNASSIGN); return true; } void OnSyntaxError(User *u, const ci::string &subcommand) { - syntax_error(s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); + syntax_error(Config.s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); } }; @@ -70,7 +70,7 @@ class BSUnassign : public Module } void OnBotServHelp(User *u) { - notice_lang(s_BotServ, u, BOT_HELP_CMD_UNASSIGN); + notice_lang(Config.s_BotServ, u, BOT_HELP_CMD_UNASSIGN); } }; diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 08680a989..5f875b1c9 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -57,17 +57,17 @@ static int access_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); *sent_header = 1; } if (ci->HasFlag(CI_XOP)) { xop = get_xop_level(access->level); - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1, xop, access->nc->display); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, index + 1, xop, access->nc->display); } else - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1, access->level, access->nc->display); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, index + 1, access->level, access->nc->display); return 1; } @@ -92,7 +92,7 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (!*sent_header) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); *sent_header = 1; } @@ -110,10 +110,10 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (ci->HasFlag(CI_XOP)) { xop = get_xop_level(access->level); - notice_lang(s_ChanServ, u, CHAN_ACCESS_VIEW_XOP_FORMAT, index + 1, xop, access->nc->display, access->creator.c_str(), timebuf); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_VIEW_XOP_FORMAT, index + 1, xop, access->nc->display, access->creator.c_str(), timebuf); } else - notice_lang(s_ChanServ, u, CHAN_ACCESS_VIEW_AXS_FORMAT, index + 1, access->level, access->nc->display, access->creator.c_str(), timebuf); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_VIEW_AXS_FORMAT, index + 1, access->level, access->nc->display, access->creator.c_str(), timebuf); return 1; } @@ -158,21 +158,21 @@ class CommandCSAccess : public Command else if ((ci->HasFlag(CI_XOP)) && !is_list) { if (ModeManager::FindChannelModeByName(CMODE_HALFOP)) - notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP_HOP, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_XOP_HOP, Config.s_ChanServ); else - notice_lang(s_ChanServ, u, CHAN_ACCESS_XOP, s_ChanServ); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_XOP, Config.s_ChanServ); } else if (( (is_list && !check_access(u, ci, CA_ACCESS_LIST) && !u->nc->HasCommand("chanserv/access/list")) || (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE) && !u->nc->HasPriv("chanserv/access/modify")) )) - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (cmd == "ADD") { if (readonly) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DISABLED); return MOD_CONT; } @@ -181,30 +181,30 @@ class CommandCSAccess : public Command if (level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (!level) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO); return MOD_CONT; } else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); return MOD_CONT; } na = findnick(nick); if (!na) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(s_ChanServ, u, NICK_X_FORBIDDEN, nick); + notice_lang(Config.s_ChanServ, u, NICK_X_FORBIDDEN, nick); return MOD_CONT; } @@ -215,26 +215,26 @@ class CommandCSAccess : public Command /* Don't allow lowering from a level >= ulev */ if (access->level >= ulev && !u->nc->HasPriv("chanserv/access/modify")) { - notice_lang(s_ChanServ, u, ACCESS_DENIED); + notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); return MOD_CONT; } if (access->level == level) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display, chan, level); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display, chan, level); return MOD_CONT; } access->level = level; FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); - notice_lang(s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); return MOD_CONT; } - if (ci->GetAccessCount() >= CSAccessMax) + if (ci->GetAccessCount() >= Config.CSAccessMax) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, CSAccessMax); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, Config.CSAccessMax); return MOD_CONT; } @@ -243,21 +243,21 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); - notice_lang(s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); } else if (cmd == "DEL") { int deleted; if (readonly) { - notice_lang(s_ChanServ, u, CHAN_ACCESS_DISABLED); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DISABLED); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(s_ChanServ,