diff options
100 files changed, 230 insertions, 220 deletions
diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 73bbd6213..5efd6ae41 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -36,43 +36,43 @@ class CommandBSAssign : public Command notice_lang(s_BotServ, u, BOT_ASSIGN_READONLY); return MOD_CONT; } - + if (!(bi = findbot(nick))) { notice_lang(s_BotServ, u, BOT_DOES_NOT_EXIST, nick); return MOD_CONT; } - + if (bi->flags & BI_PRIVATE && !is_oper(u)) { notice_lang(s_BotServ, u, PERMISSION_DENIED); return MOD_CONT; } - + if (!(ci = cs_findchan(chan))) { notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); return MOD_CONT; } - + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } - + if ((ci->bi) && (stricmp(ci->bi->nick, nick) == 0)) { notice_lang(s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick, chan); return MOD_CONT; } - + if ((ci->botflags & BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !is_services_admin(u))) { notice_lang(s_BotServ, u, PERMISSION_DENIED); return MOD_CONT; } - + bi->Assign(u, ci); notice_lang(s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); return MOD_CONT; @@ -80,7 +80,7 @@ class CommandBSAssign : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_ASSIGN); + notice_help(s_BotServ, u, BOT_HELP_ASSIGN); return true; } diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index eab919c2b..0b0352027 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -54,7 +54,7 @@ class CommandBSBadwords : public Command return MOD_CONT; } - + CommandReturn DoAdd(User *u, ChannelInfo *ci, const char *word) { char *opt, *pos; @@ -165,7 +165,7 @@ class CommandBSBadwords : public Command if (!ci->badwords[i].in_use) break; } - + if (i == ci->bwcount) { notice_lang(s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word, ci->name); @@ -298,7 +298,7 @@ class CommandBSBadwords : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_BADWORDS); + notice_help(s_BotServ, u, BOT_HELP_BADWORDS); return true; } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 86804e044..0aa569d4b 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -407,7 +407,7 @@ class CommandBSBot : public Command if (!is_services_admin(u) && !is_services_root(u)) return false; - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_BOT); + notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_BOT); return true; } diff --git a/src/core/bs_botlist.c b/src/core/bs_botlist.c index c9f4fc350..befd10d7c 100644 --- a/src/core/bs_botlist.c +++ b/src/core/bs_botlist.c @@ -69,7 +69,7 @@ class CommandBSBotList : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_BOTLIST); + notice_help(s_BotServ, u, BOT_HELP_BOTLIST); return true; } }; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index cb1b22c40..d67314503 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -239,7 +239,7 @@ class CommandBSInfo : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_INFO); + notice_help(s_BotServ, u, BOT_HELP_INFO); return true; } diff --git a/src/core/bs_say.c b/src/core/bs_say.c index 2643ff650..18f029b1c 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -23,7 +23,7 @@ class CommandBSSay : public Command CommandBSSay() : Command("SAY", 2, 2) { } - + CommandReturn Execute(User *u, std::vector<std::string> ¶ms) { ChannelInfo *ci; @@ -36,25 +36,25 @@ class CommandBSSay : public Command notice_lang(s_BotServ, u, CHAN_X_NOT_REGISTERED, chan); return MOD_CONT; } - + if (ci->flags & CI_FORBIDDEN) { notice_lang(s_BotServ, u, CHAN_X_FORBIDDEN, chan); return MOD_CONT; } - + if (!ci->bi) { notice_help(s_BotServ, u, BOT_NOT_ASSIGNED); return MOD_CONT; } - + if (!ci->c || ci->c->usercount < BSMinUsers) { notice_lang(s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); return MOD_CONT; } - + if (!check_access(u, ci, CA_SAY)) { notice_lang(s_BotServ, u, ACCESS_DENIED); @@ -66,7 +66,7 @@ class CommandBSSay : public Command this->OnSyntaxError(u); return MOD_CONT; } - + ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text); ci->bi->lastmsg = time(NULL); if (LogBot && LogChannel && logchan && !debug && findchan(LogChannel)) @@ -76,7 +76,7 @@ class CommandBSSay : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_SAY); + notice_help(s_BotServ, u, BOT_HELP_SAY); return true; } diff --git a/src/core/bs_set.c b/src/core/bs_set.c index f29da1304..8a1dda6ec 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -22,7 +22,6 @@ class CommandBSSet : public Command public: CommandBSSet() : Command("SET", 3, 3) { - this->help_param1 = s_ChanServ; } CommandReturn Execute(User *u, std::vector<std::string> ¶ms) @@ -153,25 +152,24 @@ class CommandBSSet : public Command bool OnHelp(User *u, const std::string &subcommand) { if (subcommand == "DONTKICKOPS") - notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); + notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); else if (subcommand == "DONTKICKVOICES") - notice_lang(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); + notice_help(s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); else if (subcommand == "FANTASY") - notice_lang(s_BotServ, u, BOT_HELP_SET_FANTASY); + notice_help(s_BotServ, u, BOT_HELP_SET_FANTASY); else if (subcommand == "GREET") - notice_lang(s_BotServ, u, BOT_HELP_SET_GREET); + notice_help(s_BotServ, u, BOT_HELP_SET_GREET); else if (subcommand == "SYMBIOSIS") - notice_lang(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS); + notice_help(s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, s_ChanServ); else if (subcommand == "NOBOT" && (is_services_admin(u) || is_services_root(u))) - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); + notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); else if (subcommand == "PRIVATE" && (is_services_admin(u) || is_services_root(u))) - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); + notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); else if (subcommand.empty()) { + notice_help(s_BotServ, u, BOT_HELP_SET); if (is_services_admin(u) || is_services_root(u)) - notice_lang(s_BotServ, u, BOT_SERVADMIN_HELP_SET); - else - notice_lang(s_BotServ, u, BOT_HELP_SET); + notice_help(s_BotServ, u, BOT_SERVADMIN_HELP_SET); } return true; diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index 564c8817d..944066c41 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -49,7 +49,7 @@ class CommandBSUnassign : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_BotServ, u, BOT_HELP_UNASSIGN); + notice_help(s_BotServ, u, BOT_HELP_UNASSIGN); return true; } diff --git a/src/core/cs_access.c b/src/core/cs_access.c index fffa8da38..ec58b75ea 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -376,8 +376,8 @@ class CommandCSAccess : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS); - notice_lang(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS); + notice_help(s_ChanServ, u, CHAN_HELP_ACCESS); + notice_help(s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS); return true; } }; @@ -509,7 +509,7 @@ class CommandCSLevels : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_LEVELS); + notice_help(s_ChanServ, u, CHAN_HELP_LEVELS); return true; } }; diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index bc21a81a5..4bd2b10bd 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -636,7 +636,7 @@ class CommandCSAKick : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_AKICK); + notice_help(s_ChanServ, u, CHAN_HELP_AKICK); return true; } diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 51288fa6e..bb0b6d13b 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -41,7 +41,7 @@ class CommandCSBan : public Command const char *chan = params[0].c_str(); const char *target = params[1].c_str(); const char *reason = NULL; - + if (params.size() > 2) { params[2].resize(200); @@ -116,7 +116,7 @@ class CommandCSBan : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_BAN); + notice_help(s_ChanServ, u, CHAN_HELP_BAN); return true; } @@ -174,7 +174,7 @@ class CommandCSUnban : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_UNBAN); + notice_help(s_ChanServ, u, CHAN_HELP_UNBAN); return true; } diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index 48ee0cf9d..12780a43e 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -340,7 +340,7 @@ class CommandCSClear : public Command bool OnHelp(User *u, const std::string &subcommand) { - notice_lang(s_ChanServ, u, CHAN_HELP_CLEAR); + notice_help(s_ChanServ, u, CHAN_HELP_CLEAR); return true; } diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 6dfa016d9..d5ca0bcd0 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -106,9 +106,9 @@ class CommandCSDrop : public Command bool OnHelp(User *u, const std::string &subcommand) { if (is_services_admin(u) || is_services_root(u)) - notice_lang(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP); + notice_help(s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP); else - notice_lang(s_ChanServ, u, CHAN_HELP_DROP); + notice_ |