diff options
Diffstat (limited to 'modules')
147 files changed, 2052 insertions, 3026 deletions
diff --git a/modules/core/bs_act.cpp b/modules/core/bs_act.cpp index a3487a0ab..b575f5030 100644 --- a/modules/core/bs_act.cpp +++ b/modules/core/bs_act.cpp @@ -27,19 +27,19 @@ class CommandBSAct : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(Config->s_BotServ, u, BOT_NOT_ASSIGNED); + u->SendMessage(BotServ, BOT_NOT_ASSIGNED); return MOD_CONT; } if (!ci->c || !ci->c->FindUser(ci->bi)) { - notice_lang(Config->s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); + u->SendMessage(BotServ, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -58,18 +58,18 @@ class CommandBSAct : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "ACT", BOT_ACT_SYNTAX); + SyntaxError(BotServ, u, "ACT", BOT_ACT_SYNTAX); } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_ACT); + u->SendMessage(BotServ, BOT_HELP_ACT); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_ACT); + u->SendMessage(BotServ, BOT_HELP_CMD_ACT); } }; diff --git a/modules/core/bs_assign.cpp b/modules/core/bs_assign.cpp index 97b23c0ef..c328c2f51 100644 --- a/modules/core/bs_assign.cpp +++ b/modules/core/bs_assign.cpp @@ -29,13 +29,13 @@ class CommandBSAssign : public Command if (readonly) { - notice_lang(Config->s_BotServ, u, BOT_ASSIGN_READONLY); + u->SendMessage(BotServ, BOT_ASSIGN_READONLY); return MOD_CONT; } if (!(bi = findbot(nick))) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, nick.c_str()); return MOD_CONT; } @@ -43,19 +43,19 @@ class CommandBSAssign : public Command if (ci->botflags.HasFlag(BS_NOBOT) || (!check_access(u, ci, CA_ASSIGN) && !u->Account()->HasPriv("botserv/administration"))) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } if (bi->HasFlag(BI_PRIVATE) && !u->Account()->HasCommand("botserv/assign/private")) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } if (ci->bi && nick.equals_ci(ci->bi->nick)) { - notice_lang(Config->s_BotServ, u, BOT_ASSIGN_ALREADY, ci->bi->nick.c_str(), chan.c_str()); + u->SendMessage(BotServ, BOT_ASSIGN_ALREADY, ci->bi->nick.c_str(), chan.c_str()); return MOD_CONT; } @@ -63,24 +63,24 @@ class CommandBSAssign : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << bi->nick; bi->Assign(u, ci); - notice_lang(Config->s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str()); + u->SendMessage(BotServ, BOT_ASSIGN_ASSIGNED, bi->nick.c_str(), ci->name.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_ASSIGN); + u->SendMessage(BotServ, BOT_HELP_ASSIGN); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); + SyntaxError(BotServ, u, "ASSIGN", BOT_ASSIGN_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_ASSIGN); + u->SendMessage(BotServ, BOT_HELP_CMD_ASSIGN); } }; diff --git a/modules/core/bs_badwords.cpp b/modules/core/bs_badwords.cpp index c02ff6570..52da7d777 100644 --- a/modules/core/bs_badwords.cpp +++ b/modules/core/bs_badwords.cpp @@ -26,7 +26,7 @@ class BadwordsListCallback : public NumberList ~BadwordsListCallback() { if (!SentHeader) - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); } void HandleNumber(unsigned Number) @@ -37,7 +37,7 @@ class BadwordsListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); } DoList(u, ci, Number - 1, ci->GetBadWord(Number - 1)); @@ -45,7 +45,7 @@ class BadwordsListCallback : public NumberList static void DoList(User *u, ChannelInfo *ci, unsigned Number, BadWord *bw) { - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_LIST_FORMAT, Number + 1, bw->word.c_str(), bw->type == BW_SINGLE ? "(SINGLE)" : (bw->type == BW_START ? "(START)" : (bw->type == BW_END ? "(END)" : ""))); + u->SendMessage(BotServ, BOT_BADWORDS_LIST_FORMAT, Number + 1, bw->word.c_str(), bw->type == BW_SINGLE ? "(SINGLE)" : (bw->type == BW_START ? "(START)" : (bw->type == BW_END ? "(END)" : ""))); } }; @@ -66,11 +66,11 @@ class BadwordsDelCallback : public NumberList ~BadwordsDelCallback() { if (!Deleted) - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); else if (Deleted == 1) - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, Deleted, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_DELETED_SEVERAL, Deleted, ci->name.c_str()); } void HandleNumber(unsigned Number) @@ -93,7 +93,7 @@ class CommandBSBadwords : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "LIST"; if (!ci->GetBadWordCount()) - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_LIST_EMPTY, ci->name.c_str()); else if (!word.empty() && word.find_first_not_of("1234567890,-") == Anope::string::npos) { BadwordsListCallback list(u, ci, word); @@ -113,14 +113,14 @@ class CommandBSBadwords : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); } BadwordsListCallback::DoList(u, ci, i, bw); } if (!SentHeader) - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); } return MOD_CONT; @@ -149,7 +149,7 @@ class CommandBSBadwords : public Command if (ci->GetBadWordCount() >= Config->BSBadWordsMax) { - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_REACHED_LIMIT, Config->BSBadWordsMax); + u->SendMessage(BotServ, BOT_BADWORDS_REACHED_LIMIT, Config->BSBadWordsMax); return MOD_CONT; } @@ -159,7 +159,7 @@ class CommandBSBadwords : public Command if (!bw->word.empty() && ((Config->BSCaseSensitive && realword.equals_cs(bw->word)) || (!Config->BSCaseSensitive && realword.equals_ci(bw->word)))) { - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name.c_str()); return MOD_CONT; } } @@ -168,7 +168,7 @@ class CommandBSBadwords : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << realword; ci->AddBadWord(realword, type); - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str()); return MOD_CONT; } @@ -196,7 +196,7 @@ class CommandBSBadwords : public Command if (i == end) { - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name.c_str()); return MOD_CONT; } @@ -204,7 +204,7 @@ class CommandBSBadwords : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << badword->word; ci->EraseBadWord(i); - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str()); + u->SendMessage(BotServ, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str()); } return MOD_CONT; @@ -216,7 +216,7 @@ class CommandBSBadwords : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; ci->ClearBadWords(); - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_CLEAR); + u->SendMessage(BotServ, BOT_BADWORDS_CLEAR); return MOD_CONT; } public: @@ -242,13 +242,13 @@ class CommandBSBadwords : public Command if (!check_access(u, ci, CA_BADWORDS) && (!need_args || !u->Account()->HasPriv("botserv/administration"))) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } if (readonly) { - notice_lang(Config->s_BotServ, u, BOT_BADWORDS_DISABLED); + u->SendMessage(BotServ, BOT_BADWORDS_DISABLED); return MOD_CONT; } @@ -268,18 +268,18 @@ class CommandBSBadwords : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_BADWORDS); + u->SendMessage(BotServ, BOT_HELP_BADWORDS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); + SyntaxError(BotServ, u, "BADWORDS", BOT_BADWORDS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_BADWORDS); + u->SendMessage(BotServ, BOT_HELP_CMD_BADWORDS); } }; diff --git a/modules/core/bs_bot.cpp b/modules/core/bs_bot.cpp index 7054ed479..067633964 100644 --- a/modules/core/bs_bot.cpp +++ b/modules/core/bs_bot.cpp @@ -26,60 +26,60 @@ class CommandBSBot : public Command if (findbot(nick)) { - notice_lang(Config->s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick.c_str()); + u->SendMessage(BotServ, BOT_BOT_ALREADY_EXISTS, nick.c_str()); return MOD_CONT; } if (nick.length() > Config->NickLen) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } if (user.length() > Config->UserLen) { - notice_lang(Config->s_BotServ, u, BOT_LONG_IDENT, Config->UserLen); + u->SendMessage(BotServ, BOT_LONG_IDENT, Config->UserLen); return MOD_CONT; } if (host.length() > Config->HostLen) { - notice_lang(Config->s_BotServ, u, BOT_LONG_HOST, Config->HostLen); + u->SendMessage(BotServ, BOT_LONG_HOST, Config->HostLen); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i) if (!isvalidnick(nick[i])) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } /* Check the host is valid re RFC 2812 */ if (!isValidHost(host, 3)) { - notice_lang(Config->s_BotServ, u, BOT_BAD_HOST); + u->SendMessage(BotServ, BOT_BAD_HOST); return MOD_CONT; } for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i) if (!isalnum(user[i])) { - notice_lang(Config->s_BotServ, u, BOT_BAD_IDENT, Config->UserLen); + u->SendMessage(BotServ, BOT_BAD_IDENT, Config->UserLen); return MOD_CONT; } @@ -89,20 +89,20 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(Config->s_BotServ, u, NICK_ALREADY_REGISTERED, nick.c_str()); + u->SendMessage(BotServ, NICK_ALREADY_REGISTERED, nick.c_str()); return MOD_CONT; } if (!(bi = new BotInfo(nick, user, host, real))) { // XXX this cant happen? - notice_lang(Config->s_BotServ, u, BOT_BOT_CREATION_FAILED); + u->SendMessage(BotServ, BOT_BOT_CREATION_FAILED); return MOD_CONT; } Log(LOG_ADMIN, u, this) << "ADD " << bi->GetMask() << " " << bi->realname; - notice_lang(Config->s_BotServ, u, BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); + u->SendMessage(BotServ, BOT_BOT_ADDED, bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); FOREACH_MOD(I_OnBotCreate, OnBotCreate(bi)); return MOD_CONT; @@ -125,37 +125,37 @@ class CommandBSBot : public Command if (!(bi = findbot(oldnick))) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str()); return MOD_CONT; } if (!oldnick.equals_ci(nick) && nickIsServices(oldnick, false)) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str()); return MOD_CONT; } if (nick.length() > Config->NickLen) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } if (!user.empty() && user.length() > Config->UserLen) { - notice_lang(Config->s_BotServ, u, BOT_LONG_IDENT, Config->UserLen); + u->SendMessage(BotServ, BOT_LONG_IDENT, Config->UserLen); return MOD_CONT; } if (!host.empty() && host.length() > Config->HostLen) { - notice_lang(Config->s_BotServ, u, BOT_LONG_HOST, Config->HostLen); + u->SendMessage(BotServ, BOT_LONG_HOST, Config->HostLen); return MOD_CONT; } if (!oldnick.equals_ci(nick) && nickIsServices(nick, false)) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, oldnick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, oldnick.c_str()); return MOD_CONT; } @@ -166,34 +166,34 @@ class CommandBSBot : public Command */ if (nick.equals_cs(bi->nick) && (!user.empty() ? user.equals_cs(bi->GetIdent()) : 1) && (!host.empty() ? host.equals_cs(bi->host) : 1) && (!real.empty() ? real.equals_cs(bi->realname) : 1)) { - notice_lang(Config->s_BotServ, u, BOT_BOT_ANY_CHANGES); + u->SendMessage(BotServ, BOT_BOT_ANY_CHANGES); return MOD_CONT; } /* Check the nick is valid re RFC 2812 */ if (isdigit(nick[0]) || nick[0] == '-') { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } for (unsigned i = 0, end = nick.length(); i < end && i < Config->NickLen; ++i) if (!isvalidnick(nick[i])) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } /* check for hardcored ircd forbidden nicks */ if (!ircdproto->IsNickValid(nick)) { - notice_lang(Config->s_BotServ, u, BOT_BAD_NICK); + u->SendMessage(BotServ, BOT_BAD_NICK); return MOD_CONT; } if (!host.empty() && !isValidHost(host, 3)) { - notice_lang(Config->s_BotServ, u, BOT_BAD_HOST); + u->SendMessage(BotServ, BOT_BAD_HOST); return MOD_CONT; } @@ -201,13 +201,13 @@ class CommandBSBot : public Command for (unsigned i = 0, end = user.length(); i < end && i < Config->UserLen; ++i) if (!isalnum(user[i])) { - notice_lang(Config->s_BotServ, u, BOT_BAD_IDENT, Config->UserLen); + u->SendMessage(BotServ, BOT_BAD_IDENT, Config->UserLen); return MOD_CONT; } if (!nick.equals_ci(bi->nick) && findbot(nick)) { - notice_lang(Config->s_BotServ, u, BOT_BOT_ALREADY_EXISTS, nick.c_str()); + u->SendMessage(BotServ, BOT_BOT_ALREADY_EXISTS, nick.c_str()); return MOD_CONT; } @@ -219,7 +219,7 @@ class CommandBSBot : public Command */ if (findnick(nick)) { - notice_lang(Config->s_BotServ, u, NICK_ALREADY_REGISTERED, nick.c_str()); + u->SendMessage(BotServ, NICK_ALREADY_REGISTERED, nick.c_str()); return MOD_CONT; } @@ -262,7 +262,7 @@ class CommandBSBot : public Command bi->RejoinAll(); } - notice_lang(Config->s_BotServ, u, BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); + u->SendMessage(BotServ, BOT_BOT_CHANGED, oldnick.c_str(), bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str(), bi->realname.c_str()); Log(LOG_ADMIN, u, this) << "CHANGE " << oldnick << " to " << bi->GetMask() << " " << bi->realname; FOREACH_MOD(I_OnBotChange, OnBotChange(bi)); @@ -282,13 +282,13 @@ class CommandBSBot : public Command if (!(bi = findbot(nick))) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, nick.c_str()); return MOD_CONT; } if (nickIsServices(nick, false)) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, nick.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, nick.c_str()); return MOD_CONT; } @@ -301,7 +301,7 @@ class CommandBSBot : public Command Log(LOG_ADMIN, u, this) << "DEL " << bi->nick; delete bi; - notice_lang(Config->s_BotServ, u, BOT_BOT_DELETED, nick.c_str()); + u->SendMessage(BotServ, BOT_BOT_DELETED, nick.c_str()); return MOD_CONT; } public: @@ -316,7 +316,7 @@ class CommandBSBot : public Command if (readonly) { - notice_lang(Config->s_BotServ, u, BOT_BOT_READONLY); + u->SendMessage(BotServ, BOT_BOT_READONLY); return MOD_CONT; } @@ -325,7 +325,7 @@ class CommandBSBot : public Command // ADD nick user host real - 5 if (!u->Account()->HasCommand("botserv/bot/add")) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } @@ -348,7 +348,7 @@ class CommandBSBot : public Command // but only oldn and newn are required if (!u->Account()->HasCommand("botserv/bot/change")) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } @@ -365,7 +365,7 @@ class CommandBSBot : public Command // DEL nick if (!u->Account()->HasCommand("botserv/bot/del")) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } @@ -385,18 +385,18 @@ class CommandBSBot : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_BOT); + u->SendMessage(BotServ, BOT_SERVADMIN_HELP_BOT); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "BOT", BOT_BOT_SYNTAX); + SyntaxError(BotServ, u, "BOT", BOT_BOT_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_BOT); + u->SendMessage(BotServ, BOT_HELP_CMD_BOT); } }; diff --git a/modules/core/bs_botlist.cpp b/modules/core/bs_botlist.cpp index 3234027ed..425cf48ab 100644 --- a/modules/core/bs_botlist.cpp +++ b/modules/core/bs_botlist.cpp @@ -26,7 +26,7 @@ class CommandBSBotList : public Command if (BotListByNick.empty()) { - notice_lang(Config->s_BotServ, u, BOT_BOTLIST_EMPTY); + u->SendMessage(BotServ, BOT_BOTLIST_EMPTY); return MOD_CONT; } @@ -37,7 +37,7 @@ class CommandBSBotList : public Command if (!bi->HasFlag(BI_PRIVATE)) { if (!count) - notice_lang(Config->s_BotServ, u, BOT_BOTLIST_HEADER); + u->SendMessage(BotServ, BOT_BOTLIST_HEADER); ++count; u->SendMessage(Config->s_BotServ, " %-15s (%s@%s)", bi->nick.c_str(), bi->GetIdent().c_str(), bi->host.c_str()); } @@ -45,7 +45,7 @@ class CommandBSBotList : public Command if (u->Account()->HasCommand("botserv/botlist") && count < BotListByNick.size()) { - notice_lang(Config->s_BotServ, u, BOT_BOTLIST_PRIVATE_HEADER); + u->SendMessage(BotServ, BOT_BOTLIST_PRIVATE_HEADER); for (botinfo_map::const_iterator it = BotListByNick.begin(), it_end = BotListByNick.end(); it != it_end; ++it) { @@ -60,22 +60,22 @@ class CommandBSBotList : public Command } if (!count) - notice_lang(Config->s_BotServ, u, BOT_BOTLIST_EMPTY); + u->SendMessage(BotServ, BOT_BOTLIST_EMPTY); else - notice_lang(Config->s_BotServ, u, BOT_BOTLIST_FOOTER, count); + u->SendMessage(BotServ, BOT_BOTLIST_FOOTER, count); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_BOTLIST); + u->SendMessage(BotServ, BOT_HELP_BOTLIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_BOTLIST); + u->SendMessage(BotServ, BOT_HELP_CMD_BOTLIST); } }; diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp index 9faeae9cf..fec543417 100644 --- a/modules/core/bs_help.cpp +++ b/modules/core/bs_help.cpp @@ -31,11 +31,11 @@ class CommandBSHelp : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { // Abuse syntax error to display general list help. - notice_help(Config->s_BotServ, u, BOT_HELP); + u->SendMessage(BotServ, BOT_HELP); for (CommandMap::const_iterator it = BotServ->Commands.begin(), it_end = BotServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); - notice_help(Config->s_BotServ, u, BOT_HELP_FOOTER, Config->BSMinUsers); + u->SendMessage(BotServ, BOT_HELP_FOOTER, Config->BSMinUsers); } }; diff --git a/modules/core/bs_info.cpp b/modules/core/bs_info.cpp index 214ed6e3a..2cb3475d8 100644 --- a/modules/core/bs_info.cpp +++ b/modules/core/bs_info.cpp @@ -53,20 +53,15 @@ class CommandBSInfo : public Command int need_comma = 0; char buf[BUFSIZE], *end; - const char *commastr = getstring(u, COMMA_SPACE); if ((bi = findbot(query))) { - struct tm *tm; - - notice_lang(Config->s_BotServ, u, BOT_INFO_BOT_HEADER, bi->nick.c_str()); - notice_lang(Config->s_BotServ, u, BOT_INFO_BOT_MASK, bi->GetIdent().c_str(), bi->host.c_str()); - notice_lang(Config->s_BotServ, u, BOT_INFO_BOT_REALNAME, bi->realname.c_str()); - tm = localtime(&bi->created); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - 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); + u->SendMessage(BotServ, BOT_INFO_BOT_HEADER, bi->nick.c_str()); + u->SendMessage(BotServ, BOT_INFO_BOT_MASK, bi->GetIdent().c_str(), bi->host.c_str()); + u->SendMessage(BotServ, BOT_INFO_BOT_REALNAME, bi->realname.c_str()); + u->SendMessage(BotServ, BOT_INFO_BOT_CREATED, do_strftime(bi->created).c_str()); + u->SendMessage(BotServ, BOT_INFO_BOT_OPTIONS, GetString(u, (bi->HasFlag(BI_PRIVATE) ? NICK_INFO_OPT_PRIVATE : NICK_INFO_OPT_NONE)).c_str()); + u->SendMessage(BotServ, BOT_INFO_BOT_USAGE, bi->chancount); if (u->Account()->HasPriv("botserv/administration")) this->send_bot_channels(u, bi); @@ -75,151 +70,151 @@ class CommandBSInfo : public Command { if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("botserv/administration")) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name.c_str()); + u->SendMessage(BotServ, CHAN_INFO_HEADER, ci->name.c_str()); if (ci->bi) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick.c_str()); + u->SendMessage(BotServ, BOT_INFO_CHAN_BOT, ci->bi->nick.c_str()); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_BOT_NONE); + u->SendMessage(BotServ, BOT_INFO_CHAN_BOT_NONE); if (ci->botflags.HasFlag(BS_KICK_BADWORDS)) { if (ci->ttb[TTB_BADWORDS]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BADWORDS]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BADWORDS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_BADWORDS]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BADWORDS, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BADWORDS, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BADWORDS, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_BOLDS)) { if (ci->ttb[TTB_BOLDS]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_BOLDS]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BOLDS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_BOLDS]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BOLDS, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_BOLDS, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_BOLDS, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_CAPS)) { if (ci->ttb[TTB_CAPS]) - 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); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_CAPS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_CAPS], ci->capsmin, ci->capspercent); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_ON, getstring(u, BOT_INFO_ACTIVE), ci->capsmin, ci->capspercent); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_CAPS_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->capsmin, ci->capspercent); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_CAPS_OFF, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_CAPS_OFF, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_COLORS)) { if (ci->ttb[TTB_COLORS]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_COLORS]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_COLORS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_COLORS]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_COLORS, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_COLORS, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_COLORS, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_FLOOD)) { if (ci->ttb[TTB_FLOOD]) - 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); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_FLOOD_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_FLOOD], ci->floodlines, ci->floodsecs); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_ON, getstring(u, BOT_INFO_ACTIVE), ci->floodlines, ci->floodsecs); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_FLOOD_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->floodlines, ci->floodsecs); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_FLOOD_OFF, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_FLOOD_OFF, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_REPEAT)) { if (ci->ttb[TTB_REPEAT]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REPEAT], ci->repeattimes); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REPEAT_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_REPEAT], ci->repeattimes); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_ON, getstring(u, BOT_INFO_ACTIVE), ci->repeattimes); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REPEAT_ON, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->repeattimes); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REPEAT_OFF, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REPEAT_OFF, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_REVERSES)) { if (ci->ttb[TTB_REVERSES]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_REVERSES]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REVERSES_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_REVERSES]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REVERSES, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_REVERSES, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_REVERSES, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_UNDERLINES)) { if (ci->ttb[TTB_UNDERLINES]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_UNDERLINES]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_UNDERLINES_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_UNDERLINES]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_UNDERLINES, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_UNDERLINES, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_UNDERLINES, GetString(u, BOT_INFO_INACTIVE).c_str()); if (ci->botflags.HasFlag(BS_KICK_ITALICS)) { if (ci->ttb[TTB_ITALICS]) - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS_BAN, getstring(u, BOT_INFO_ACTIVE), ci->ttb[TTB_ITALICS]); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_ITALICS_BAN, GetString(u, BOT_INFO_ACTIVE).c_str(), ci->ttb[TTB_ITALICS]); else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS, getstring(u, BOT_INFO_ACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_ITALICS, GetString(u, BOT_INFO_ACTIVE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_KICK_ITALICS, getstring(u, BOT_INFO_INACTIVE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_KICK_ITALICS, GetString(u, BOT_INFO_INACTIVE).c_str()); end = buf; *end = 0; if (ci->botflags.HasFlag(BS_DONTKICKOPS)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s", getstring(u, BOT_INFO_OPT_DONTKICKOPS)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s", GetString(u, BOT_INFO_OPT_DONTKICKOPS).c_str()); need_comma = 1; } if (ci->botflags.HasFlag(BS_DONTKICKVOICES)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? commastr : "", getstring(u, BOT_INFO_OPT_DONTKICKVOICES)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_DONTKICKVOICES).c_str()); need_comma = 1; } if (ci->botflags.HasFlag(BS_FANTASY)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? commastr : "", getstring(u, BOT_INFO_OPT_FANTASY)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_FANTASY).c_str()); need_comma = 1; } if (ci->botflags.HasFlag(BS_GREET)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? commastr : "", getstring(u, BOT_INFO_OPT_GREET)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_GREET).c_str()); need_comma = 1; } if (ci->botflags.HasFlag(BS_NOBOT)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? commastr : "", getstring(u, BOT_INFO_OPT_NOBOT)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_NOBOT).c_str()); need_comma = 1; } if (ci->botflags.HasFlag(BS_SYMBIOSIS)) { - end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? commastr : "", getstring(u, BOT_INFO_OPT_SYMBIOSIS)); + end += snprintf(end, sizeof(buf) - (end - buf), "%s%s", need_comma ? ", " : "", GetString(u, BOT_INFO_OPT_SYMBIOSIS).c_str()); need_comma = 1; } - notice_lang(Config->s_BotServ, u, BOT_INFO_CHAN_OPTIONS, *buf ? buf : getstring(u, BOT_INFO_OPT_NONE)); + u->SendMessage(BotServ, BOT_INFO_CHAN_OPTIONS, *buf ? buf : GetString(u, BOT_INFO_OPT_NONE).c_str()); } else - notice_lang(Config->s_BotServ, u, BOT_INFO_NOT_FOUND, query.c_str()); + u->SendMessage(BotServ, BOT_INFO_NOT_FOUND, query.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_INFO); + u->SendMessage(BotServ, BOT_HELP_INFO); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "INFO", BOT_INFO_SYNTAX); + SyntaxError(BotServ, u, "INFO", BOT_INFO_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_INFO); + u->SendMessage(BotServ, BOT_HELP_CMD_INFO); } }; diff --git a/modules/core/bs_kick.cpp b/modules/core/bs_kick.cpp index 2ed3c8639..380236a43 100644 --- a/modules/core/bs_kick.cpp +++ b/modules/core/bs_kick.cpp @@ -31,15 +31,15 @@ class CommandBSKick : public Command ChannelInfo *ci = cs_findchan(chan); if (readonly) - notice_lang(Config->s_BotServ, u, BOT_KICK_DISABLED); + u->SendMessage(BotServ, BOT_KICK_DISABLED); else if (chan.empty() || option.empty() || value.empty()) - syntax_error(Config->s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + SyntaxError(BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (!value.equals_ci("ON") && !value.equals_ci("OFF")) - syntax_error(Config->s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + SyntaxError(BotServ, u, "KICK", BOT_KICK_SYNTAX); else if (!check_access(u, ci, CA_SET) && !u->Account()->HasPriv("botserv/administration")) - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); else if (!ci->bi) - notice_help(Config->s_BotServ, u, BOT_NOT_ASSIGNED); + u->SendMessage(BotServ, BOT_NOT_ASSIGNED); else { bool override = !check_access(u, ci, CA_SET); @@ -60,7 +60,7 @@ class CommandBSKick : public Command Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BADWORDS]; /* reset the value back to 0 - TSL */ ci->ttb[TTB_BADWORDS] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -68,14 +68,14 @@ class CommandBSKick : public Command ci->ttb[TTB_BADWORDS] = 0; ci->botflags.SetFlag(BS_KICK_BADWORDS); if (ci->ttb[TTB_BADWORDS]) - notice_lang(Config->s_BotServ, u, BOT_KICK_BADWORDS_ON_BAN, ci->ttb[TTB_BADWORDS]); + u->SendMessage(BotServ, BOT_KICK_BADWORDS_ON_BAN, ci->ttb[TTB_BADWORDS]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_BADWORDS_ON); + u->SendMessage(BotServ, BOT_KICK_BADWORDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BADWORDS); - notice_lang(Config->s_BotServ, u, BOT_KICK_BADWORDS_OFF); + u->SendMessage(BotServ, BOT_KICK_BADWORDS_OFF); } } else if (option.equals_ci("BOLDS")) @@ -90,7 +90,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_BOLDS]; ci->ttb[TTB_BOLDS] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -98,14 +98,14 @@ class CommandBSKick : public Command ci->ttb[TTB_BOLDS] = 0; ci->botflags.SetFlag(BS_KICK_BOLDS); if (ci->ttb[TTB_BOLDS]) - notice_lang(Config->s_BotServ, u, BOT_KICK_BOLDS_ON_BAN, ci->ttb[TTB_BOLDS]); + u->SendMessage(BotServ, BOT_KICK_BOLDS_ON_BAN, ci->ttb[TTB_BOLDS]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_BOLDS_ON); + u->SendMessage(BotServ, BOT_KICK_BOLDS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_BOLDS); - notice_lang(Config->s_BotServ, u, BOT_KICK_BOLDS_OFF); + u->SendMessage(BotServ, BOT_KICK_BOLDS_OFF); } } else if (option.equals_ci("CAPS")) @@ -123,7 +123,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_CAPS]; ci->ttb[TTB_CAPS] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -146,14 +146,14 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_CAPS); if (ci->ttb[TTB_CAPS]) - notice_lang(Config->s_BotServ, u, BOT_KICK_CAPS_ON_BAN, ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]); + u->SendMessage(BotServ, BOT_KICK_CAPS_ON_BAN, ci->capsmin, ci->capspercent, ci->ttb[TTB_CAPS]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_CAPS_ON, ci->capsmin, ci->capspercent); + u->SendMessage(BotServ, BOT_KICK_CAPS_ON, ci->capsmin, ci->capspercent); } else { ci->botflags.UnsetFlag(BS_KICK_CAPS); - notice_lang(Config->s_BotServ, u, BOT_KICK_CAPS_OFF); + u->SendMessage(BotServ, BOT_KICK_CAPS_OFF); } } else if (option.equals_ci("COLORS")) @@ -168,7 +168,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_COLORS]; ci->ttb[TTB_COLORS] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -176,14 +176,14 @@ class CommandBSKick : public Command ci->ttb[TTB_COLORS] = 0; ci->botflags.SetFlag(BS_KICK_COLORS); if (ci->ttb[TTB_COLORS]) - notice_lang(Config->s_BotServ, u, BOT_KICK_COLORS_ON_BAN, ci->ttb[TTB_COLORS]); + u->SendMessage(BotServ, BOT_KICK_COLORS_ON_BAN, ci->ttb[TTB_COLORS]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_COLORS_ON); + u->SendMessage(BotServ, BOT_KICK_COLORS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_COLORS); - notice_lang(Config->s_BotServ, u, BOT_KICK_COLORS_OFF); + u->SendMessage(BotServ, BOT_KICK_COLORS_OFF); } } else if (option.equals_ci("FLOOD")) @@ -201,7 +201,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_FLOOD]; ci->ttb[TTB_FLOOD] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -224,14 +224,14 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_FLOOD); if (ci->ttb[TTB_FLOOD]) - notice_lang(Config->s_BotServ, u, BOT_KICK_FLOOD_ON_BAN, ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); + u->SendMessage(BotServ, BOT_KICK_FLOOD_ON_BAN, ci->floodlines, ci->floodsecs, ci->ttb[TTB_FLOOD]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_FLOOD_ON, ci->floodlines, ci->floodsecs); + u->SendMessage(BotServ, BOT_KICK_FLOOD_ON, ci->floodlines, ci->floodsecs); } else { ci->botflags.UnsetFlag(BS_KICK_FLOOD); - notice_lang(Config->s_BotServ, u, BOT_KICK_FLOOD_OFF); + u->SendMessage(BotServ, BOT_KICK_FLOOD_OFF); } } else if (option.equals_ci("REPEAT")) @@ -248,7 +248,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REPEAT]; ci->ttb[TTB_REPEAT] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -264,14 +264,14 @@ class CommandBSKick : public Command ci->botflags.SetFlag(BS_KICK_REPEAT); if (ci->ttb[TTB_REPEAT]) - notice_lang(Config->s_BotServ, u, BOT_KICK_REPEAT_ON_BAN, ci->repeattimes, ci->ttb[TTB_REPEAT]); + u->SendMessage(BotServ, BOT_KICK_REPEAT_ON_BAN, ci->repeattimes, ci->ttb[TTB_REPEAT]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_REPEAT_ON, ci->repeattimes); + u->SendMessage(BotServ, BOT_KICK_REPEAT_ON, ci->repeattimes); } else { ci->botflags.UnsetFlag(BS_KICK_REPEAT); - notice_lang(Config->s_BotServ, u, BOT_KICK_REPEAT_OFF); + u->SendMessage(BotServ, BOT_KICK_REPEAT_OFF); } } else if (option.equals_ci("REVERSES")) @@ -286,7 +286,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_REVERSES]; ci->ttb[TTB_REVERSES] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -294,14 +294,14 @@ class CommandBSKick : public Command ci->ttb[TTB_REVERSES] = 0; ci->botflags.SetFlag(BS_KICK_REVERSES); if (ci->ttb[TTB_REVERSES]) - notice_lang(Config->s_BotServ, u, BOT_KICK_REVERSES_ON_BAN, ci->ttb[TTB_REVERSES]); + u->SendMessage(BotServ, BOT_KICK_REVERSES_ON_BAN, ci->ttb[TTB_REVERSES]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_REVERSES_ON); + u->SendMessage(BotServ, BOT_KICK_REVERSES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_REVERSES); - notice_lang(Config->s_BotServ, u, BOT_KICK_REVERSES_OFF); + u->SendMessage(BotServ, BOT_KICK_REVERSES_OFF); } } else if (option.equals_ci("UNDERLINES")) @@ -316,7 +316,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_UNDERLINES]; ci->ttb[TTB_UNDERLINES] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -324,14 +324,14 @@ class CommandBSKick : public Command ci->ttb[TTB_UNDERLINES] = 0; ci->botflags.SetFlag(BS_KICK_UNDERLINES); if (ci->ttb[TTB_UNDERLINES]) - notice_lang(Config->s_BotServ, u, BOT_KICK_UNDERLINES_ON_BAN, ci->ttb[TTB_UNDERLINES]); + u->SendMessage(BotServ, BOT_KICK_UNDERLINES_ON_BAN, ci->ttb[TTB_UNDERLINES]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_UNDERLINES_ON); + u->SendMessage(BotServ, BOT_KICK_UNDERLINES_ON); } else { ci->botflags.UnsetFlag(BS_KICK_UNDERLINES); - notice_lang(Config->s_BotServ, u, BOT_KICK_UNDERLINES_OFF); + u->SendMessage(BotServ, BOT_KICK_UNDERLINES_OFF); } } else if (option.equals_ci("ITALICS")) @@ -346,7 +346,7 @@ class CommandBSKick : public Command { Log(LOG_DEBUG) << "remainder of ttb " << error << " ttb " << ci->ttb[TTB_ITALICS]; ci->ttb[TTB_ITALICS] = 0; - notice_lang(Config->s_BotServ, u, BOT_KICK_BAD_TTB, ttb.c_str()); + u->SendMessage(BotServ, BOT_KICK_BAD_TTB, ttb.c_str()); return MOD_CONT; } } @@ -354,18 +354,18 @@ class CommandBSKick : public Command ci->ttb[TTB_ITALICS] = 0; ci->botflags.SetFlag(BS_KICK_ITALICS); if (ci->ttb[TTB_ITALICS]) - notice_lang(Config->s_BotServ, u, BOT_KICK_ITALICS_ON_BAN, ci->ttb[TTB_ITALICS]); + u->SendMessage(BotServ, BOT_KICK_ITALICS_ON_BAN, ci->ttb[TTB_ITALICS]); else - notice_lang(Config->s_BotServ, u, BOT_KICK_ITALICS_ON); + u->SendMessage(BotServ, BOT_KICK_ITALICS_ON); } else { ci->botflags.UnsetFlag(BS_KICK_ITALICS); - notice_lang(Config->s_BotServ, u, BOT_KICK_ITALICS_OFF); + u->SendMessage(BotServ, BOT_KICK_ITALICS_OFF); } } else - notice_help(Config->s_BotServ, u, BOT_KICK_UNKNOWN, option.c_str()); + u->SendMessage(BotServ, BOT_KICK_UNKNOWN, option.c_str()); } return MOD_CONT; } @@ -373,25 +373,25 @@ class CommandBSKick : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (subcommand.empty()) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK); + u->SendMessage(BotServ, BOT_HELP_KICK); else if (subcommand.equals_ci("BADWORDS")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_BADWORDS); + u->SendMessage(BotServ, BOT_HELP_KICK_BADWORDS); else if (subcommand.equals_ci("BOLDS")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_BOLDS); + u->SendMessage(BotServ, BOT_HELP_KICK_BOLDS); else if (subcommand.equals_ci("CAPS")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_CAPS); + u->SendMessage(BotServ, BOT_HELP_KICK_CAPS); else if (subcommand.equals_ci("COLORS")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_COLORS); + u->SendMessage(BotServ, BOT_HELP_KICK_COLORS); else if (subcommand.equals_ci("FLOOD")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_FLOOD); + u->SendMessage(BotServ, BOT_HELP_KICK_FLOOD); else if (subcommand.equals_ci("REPEAT")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_REPEAT); + u->SendMessage(BotServ, BOT_HELP_KICK_REPEAT); else if (subcommand.equals_ci("REVERSES")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_REVERSES); + u->SendMessage(BotServ, BOT_HELP_KICK_REVERSES); else if (subcommand.equals_ci("UNDERLINES")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_UNDERLINES); + u->SendMessage(BotServ, BOT_HELP_KICK_UNDERLINES); else if (subcommand.equals_ci("ITALICS")) - notice_help(Config->s_BotServ, u, BOT_HELP_KICK_ITALICS); + u->SendMessage(BotServ, BOT_HELP_KICK_ITALICS); else return false; @@ -400,12 +400,12 @@ class CommandBSKick : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "KICK", BOT_KICK_SYNTAX); + SyntaxError(BotServ, u, "KICK", BOT_KICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_KICK); + u->SendMessage(BotServ, BOT_HELP_CMD_KICK); } }; diff --git a/modules/core/bs_say.cpp b/modules/core/bs_say.cpp index 34524e11c..a829cf368 100644 --- a/modules/core/bs_say.cpp +++ b/modules/core/bs_say.cpp @@ -31,19 +31,19 @@ class CommandBSSay : public Command if (!check_access(u, ci, CA_SAY)) { - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); return MOD_CONT; } if (!ci->bi) { - notice_help(Config->s_BotServ, u, BOT_NOT_ASSIGNED); + u->SendMessage(BotServ, BOT_NOT_ASSIGNED); return MOD_CONT; } if (!ci->c || !ci->c->FindUser(ci->bi)) { - notice_lang(Config->s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); + u->SendMessage(BotServ, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -64,18 +64,18 @@ class CommandBSSay : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_SAY); + u->SendMessage(BotServ, BOT_HELP_SAY); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "SAY", BOT_SAY_SYNTAX); + SyntaxError(BotServ, u, "SAY", BOT_SAY_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_SAY); + u->SendMessage(BotServ, BOT_HELP_CMD_SAY); } }; diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp index 990dba800..7f9acc5ed 100644 --- a/modules/core/bs_set.cpp +++ b/modules/core/bs_set.cpp @@ -30,7 +30,7 @@ class CommandBSSet : public Command if (readonly) { - notice_lang(Config->s_BotServ, u, BOT_SET_DISABLED); + u->SendMessage(BotServ, BOT_SET_DISABLED); return MOD_CONT; } @@ -40,28 +40,28 @@ class CommandBSSet : public Command if (!(bi = findbot(chan))) { - notice_lang(Config->s_BotServ, u, BOT_DOES_NOT_EXIST, chan.c_str()); + u->SendMessage(BotServ, BOT_DOES_NOT_EXIST, chan.c_str()); return MOD_CONT; } if (value.equals_ci("ON")) { bi->SetFlag(BI_PRIVATE); - notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_ON, bi->nick.c_str()); + u->SendMessage(BotServ, BOT_SET_PRIVATE_ON, bi->nick.c_str()); } else if (value.equals_ci("OFF")) { bi->UnsetFlag(BI_PRIVATE); - notice_lang(Config->s_BotServ, u, BOT_SET_PRIVATE_OFF, bi->nick.c_str()); + u->SendMessage(BotServ, BOT_SET_PRIVATE_OFF, bi->nick.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); + SyntaxError(BotServ, u, "SET PRIVATE", BOT_SET_PRIVATE_SYNTAX); return MOD_CONT; } else if (!(ci = cs_findchan(chan))) - notice_lang(Config->s_BotServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + u->SendMessage(BotServ, CHAN_X_NOT_REGISTERED, chan.c_str()); else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_SET)) - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); else { bool override = !check_access(u, ci, CA_SET); @@ -72,60 +72,60 @@ class CommandBSSet : public Command if (value.equals_ci("ON")) { ci->botflags.SetFlag(BS_DONTKICKOPS); - notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_DONTKICKOPS_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_DONTKICKOPS); - notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_DONTKICKOPS_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); + SyntaxError(BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); } else if (option.equals_ci("DONTKICKVOICES")) { if (value.equals_ci("ON")) { ci->botflags.SetFlag(BS_DONTKICKVOICES); - notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_DONTKICKVOICES_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_DONTKICKVOICES); - notice_lang(Config->s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_DONTKICKVOICES_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); + SyntaxError(BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); } else if (option.equals_ci("FANTASY")) { if (value.equals_ci("ON")) { ci->botflags.SetFlag(BS_FANTASY); - notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_FANTASY_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_FANTASY); - notice_lang(Config->s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_FANTASY_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); + SyntaxError(BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); } else if (option.equals_ci("GREET")) { if (value.equals_ci("ON")) { ci->botflags.SetFlag(BS_GREET); - notice_lang(Config->s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_GREET_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_GREET); - notice_lang(Config->s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_GREET_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); + SyntaxError(BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); } else if (u->Account()->HasCommand("botserv/set/nobot") && option.equals_ci("NOBOT")) { @@ -134,33 +134,33 @@ class CommandBSSet : public Command ci->botflags.SetFlag(BS_NOBOT); if (ci->bi) ci->bi->UnAssign(u, ci); - notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_NOBOT_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_NOBOT); - notice_lang(Config->s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_NOBOT_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); + SyntaxError(BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); } else if (option.equals_ci("SYMBIOSIS")) { if (value.equals_ci("ON")) { ci->botflags.SetFlag(BS_SYMBIOSIS); - notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_SYMBIOSIS_ON, ci->name.c_str()); } else if (value.equals_ci("OFF")) { ci->botflags.UnsetFlag(BS_SYMBIOSIS); - notice_lang(Config->s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str()); + u->SendMessage(BotServ, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str()); } else - syntax_error(Config->s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); + SyntaxError(BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); } else - notice_help(Config->s_BotServ, u, BOT_SET_UNKNOWN, option.c_str()); + u->SendMessage(BotServ, BOT_SET_UNKNOWN, option.c_str()); } return MOD_CONT; } @@ -169,24 +169,24 @@ class CommandBSSet : public Command { if (subcommand.empty()) { - notice_help(Config->s_BotServ, u, BOT_HELP_SET); + u->SendMessage(BotServ, BOT_HELP_SET); if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET); + u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET); } else if (subcommand.equals_ci("DONTKICKOPS")) - notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKOPS); + u->SendMessage(BotServ, BOT_HELP_SET_DONTKICKOPS); else if (subcommand.equals_ci("DONTKICKVOICES")) - notice_help(Config->s_BotServ, u, BOT_HELP_SET_DONTKICKVOICES); + u->SendMessage(BotServ, BOT_HELP_SET_DONTKICKVOICES); else if (subcommand.equals_ci("FANTASY")) - notice_help(Config->s_BotServ, u, BOT_HELP_SET_FANTASY); + u->SendMessage(BotServ, BOT_HELP_SET_FANTASY); else if (subcommand.equals_ci("GREET")) - notice_help(Config->s_BotServ, u, BOT_HELP_SET_GREET); + u->SendMessage(BotServ, BOT_HELP_SET_GREET); else if (subcommand.equals_ci("SYMBIOSIS")) - notice_lang(Config->s_BotServ, u, BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str()); + u->SendMessage(BotServ, BOT_HELP_SET_SYMBIOSIS, Config->s_ChanServ.c_str()); else if (subcommand.equals_ci("NOBOT")) - notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_NOBOT); + u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET_NOBOT); else if (subcommand.equals_ci("PRIVATE")) - notice_lang(Config->s_BotServ, u, BOT_SERVADMIN_HELP_SET_PRIVATE); + u->SendMessage(BotServ, BOT_SERVADMIN_HELP_SET_PRIVATE); else return false; @@ -195,12 +195,12 @@ class CommandBSSet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "SET", BOT_SET_SYNTAX); + SyntaxError(BotServ, u, "SET", BOT_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_SET); + u->SendMessage(BotServ, BOT_HELP_CMD_SET); } }; diff --git a/modules/core/bs_unassign.cpp b/modules/core/bs_unassign.cpp index 6b6b28fe9..c381ec61a 100644 --- a/modules/core/bs_unassign.cpp +++ b/modules/core/bs_unassign.cpp @@ -27,38 +27,38 @@ class CommandBSUnassign : public Command ChannelMode *cm = ModeManager::FindChannelModeByName(CMODE_PERM); if (readonly) - notice_lang(Config->s_BotServ, u, BOT_ASSIGN_READONLY); + u->SendMessage(BotServ, BOT_ASSIGN_READONLY); else if (!u->Account()->HasPriv("botserv/administration") && !check_access(u, ci, CA_ASSIGN)) - notice_lang(Config->s_BotServ, u, ACCESS_DENIED); + u->SendMessage(BotServ, ACCESS_DENIED); else if (!ci->bi) - notice_help(Config->s_BotServ, u, BOT_NOT_ASSIGNED); + u->SendMessage(BotServ, BOT_NOT_ASSIGNED); else if (ci->HasFlag(CI_PERSIST) && !cm) - notice_help(Config->s_BotServ, u, BOT_UNASSIGN_PERSISTANT_CHAN); + u->SendMessage(BotServ, BOT_UNASSIGN_PERSISTANT_CHAN); else { bool override = !check_access(u, ci, CA_ASSIGN); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "for " << ci->bi->nick; ci->bi->UnAssign(u, ci); - notice_lang(Config->s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name.c_str()); + u->SendMessage(BotServ, BOT_UNASSIGN_UNASSIGNED, ci->name.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_BotServ, u, BOT_HELP_UNASSIGN); + u->SendMessage(BotServ, BOT_HELP_UNASSIGN); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); + SyntaxError(BotServ, u, "UNASSIGN", BOT_UNASSIGN_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_BotServ, u, BOT_HELP_CMD_UNASSIGN); + u->SendMessage(BotServ, BOT_HELP_CMD_UNASSIGN); } }; diff --git a/modules/core/cs_access.cpp b/modules/core/cs_access.cpp index 81084e1a5..e44309d3a 100644 --- a/modules/core/cs_access.cpp +++ b/modules/core/cs_access.cpp @@ -27,9 +27,9 @@ class AccessListCallback : public NumberList ~AccessListCallback() { if (SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); } virtual void HandleNumber(unsigned Number) @@ -40,7 +40,7 @@ class AccessListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); } DoList(u, ci, Number - 1, ci->GetAccess(Number - 1)); @@ -51,10 +51,10 @@ class AccessListCallback : public NumberList if (ci->HasFlag(CI_XOP)) { Anope::string xop = get_xop_level(access->level); - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_XOP_FORMAT, Number + 1, xop.c_str(), access->nc->display.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_XOP_FORMAT, Number + 1, xop.c_str(), access->nc->display.c_str()); } else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_AXS_FORMAT, Number + 1, access->level, access->nc->display.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_AXS_FORMAT, Number + 1, access->level, access->nc->display.c_str()); } }; @@ -73,7 +73,7 @@ class AccessViewCallback : public AccessListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); } DoList(u, ci, Number - 1, ci->GetAccess(Number - 1)); @@ -81,26 +81,21 @@ class AccessViewCallback : public AccessListCallback static void DoList(User *u, ChannelInfo *ci, unsigned Number, ChanAccess *access) { - char timebuf[64] = ""; - struct tm tm; - + Anope::string timebuf; if (ci->c && u->Account() && nc_on_chan(ci->c, u->Account())) - snprintf(timebuf, sizeof(timebuf), "Now"); + timebuf = "Now"; else if (access->last_seen == 0) - snprintf(timebuf, sizeof(timebuf), "Never"); + timebuf = "Never"; else - { - tm = *localtime(&access->last_seen); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); - } + timebuf = do_strftime(access->last_seen); if (ci->HasFlag(CI_XOP)) { Anope::string xop = get_xop_level(access->level); - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_VIEW_XOP_FORMAT, Number + 1, xop.c_str(), access->nc->display.c_str(), access->creator.c_str(), timebuf); + u->SendMessage(ChanServ, CHAN_ACCESS_VIEW_XOP_FORMAT, Number + 1, xop.c_str(), access->nc->display.c_str(), access->creator.c_str(), timebuf.c_str()); } else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_VIEW_AXS_FORMAT, Number + 1, access->level, access->nc->display.c_str(), access->creator.c_str(), timebuf); + u->SendMessage(ChanServ, CHAN_ACCESS_VIEW_AXS_FORMAT, Number + 1, access->level, access->nc->display.c_str(), access->creator.c_str(), timebuf.c_str()); } }; @@ -123,17 +118,17 @@ class AccessDelCallback : public NumberList ~AccessDelCallback() { if (Denied && !Deleted) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!Deleted) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); else { Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "for user" << (Deleted == 1 ? " " : "s ") << Nicks; if (Deleted == 1) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, Deleted, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_DELETED_SEVERAL, Deleted, ci->name.c_str()); } } @@ -172,18 +167,18 @@ class CommandCSAccess : public Command if (level >= ulev && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } if (!level) { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LEVEL_NONZERO); + u->SendMessage(ChanServ, CHAN_ACCESS_LEVEL_NONZERO); return MOD_CONT; } else if (level <= ACCESS_INVALID || level >= ACCESS_FOUNDER) { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + u->SendMessage(ChanServ, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); return MOD_CONT; } @@ -192,12 +187,12 @@ class CommandCSAccess : public Command NickAlias *na = findnick(nick); if (!na) { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NICKS_ONLY); + u->SendMessage(ChanServ, CHAN_ACCESS_NICKS_ONLY); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(ChanServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } @@ -208,12 +203,12 @@ class CommandCSAccess : public Command /* Don't allow lowering from a level >= ulev */ if (access->level >= ulev && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } if (access->level == level) { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display.c_str(), ci->name.c_str(), level); + u->SendMessage(ChanServ, CHAN_ACCESS_LEVEL_UNCHANGED, access->nc->display.c_str(), ci->name.c_str(), level); return MOD_CONT; } access->level = level; @@ -221,13 +216,13 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nc, level)); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << na->nick << " (group: " << nc->display << ") (level: " << level << ") as level " << ulev; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display.c_str(), ci->name.c_str(), level); + u->SendMessage(ChanServ, CHAN_ACCESS_LEVEL_CHANGED, nc->display.c_str(), ci->name.c_str(), level); return MOD_CONT; } if (ci->GetAccessCount() >= Config->CSAccessMax) { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_REACHED_LIMIT, Config->CSAccessMax); + u->SendMessage(ChanServ, CHAN_ACCESS_REACHED_LIMIT, Config->CSAccessMax); return MOD_CONT; } @@ -236,7 +231,7 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, nc, level)); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ADD " << na->nick << " (group: " << nc->display << ") (level: " << level << ") as level " << ulev; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display.c_str(), ci->name.c_str(), level); + u->SendMessage(ChanServ, CHAN_ACCESS_ADDED, nc->display.c_str(), ci->name.c_str(), level); return MOD_CONT; } @@ -246,7 +241,7 @@ class CommandCSAccess : public Command Anope::string nick = params[2]; if (!ci->GetAccessCount()) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); else if (isdigit(nick[0]) && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { AccessDelCallback list(u, ci, this, nick); @@ -257,7 +252,7 @@ class CommandCSAccess : public Command NickAlias *na = findnick(nick); if (!na) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_REGISTERED, nick.c_str()); return MOD_CONT; } @@ -274,12 +269,12 @@ class CommandCSAccess : public Command } if (i == end) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NOT_FOUND, nick.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_NOT_FOUND, nick.c_str(), ci->name.c_str()); else if (get_access(u, ci) <= access->level && !u->Account()->HasPriv("chanserv/access/modify")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_DELETED, access->nc->display.c_str(), ci->name.c_str()); bool override = !check_access(u, ci, CA_ACCESS_CHANGE); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << na->nick << " (group: " << access->nc->display << ") from level " << access->level; @@ -297,7 +292,7 @@ class CommandCSAccess : public Command Anope::string nick = params.size() > 2 ? params[2] : ""; if (!ci->GetAccessCount()) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { AccessListCallback list(u, ci, nick); @@ -317,16 +312,16 @@ class CommandCSAccess : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); } AccessListCallback::DoList(u, ci, i, access); } if (SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); } return MOD_CONT; @@ -337,7 +332,7 @@ class CommandCSAccess : public Command Anope::string nick = params.size() > 2 ? params[2] : ""; if (!ci->GetAccessCount()) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_EMPTY, ci->name.c_str()); else if (!nick.empty() && nick.find_first_not_of("1234567890,-") == Anope::string::npos) { AccessViewCallback list(u, ci, nick); @@ -357,16 +352,16 @@ class CommandCSAccess : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); } AccessViewCallback::DoList(u, ci, i, access); } if (SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); } return MOD_CONT; @@ -375,14 +370,14 @@ class CommandCSAccess : public Command CommandReturn DoClear(User *u, ChannelInfo *ci) { if (!IsFounder(u, ci) && !u->Account()->HasPriv("chanserv/access/modify")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { ci->ClearAccess(); FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_CLEAR, ci->name.c_str()); bool override = !IsFounder(u, ci); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; @@ -417,14 +412,14 @@ class CommandCSAccess : public Command else if (ci->HasFlag(CI_XOP) && !is_list && !is_clear) { if (ModeManager::FindChannelModeByName(CMODE_HALFOP)) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_XOP_HOP, Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_XOP_HOP, Config->s_ChanServ.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_XOP, Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_ACCESS_XOP, Config->s_ChanServ.c_str()); } else if ((is_list && !check_access(u, ci, CA_ACCESS_LIST) && !u->Account()->HasCommand("chanserv/access/list")) || (!is_list && !check_access(u, ci, CA_ACCESS_CHANGE) && !u->Account()->HasPriv("chanserv/access/modify"))) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (readonly && (cmd.equals_ci("ADD") || cmd.equals_ci("DEL") || cmd.equals_ci("CLEAR"))) - notice_lang(Config->s_ChanServ, u, CHAN_ACCESS_DISABLED); + u->SendMessage(ChanServ, CHAN_ACCESS_DISABLED); else if (cmd.equals_ci("ADD")) this->DoAdd(u, ci, params); else if (cmd.equals_ci("DEL")) @@ -443,14 +438,14 @@ class CommandCSAccess : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_ACCESS); - notice_help(Config->s_ChanServ, u, CHAN_HELP_ACCESS_LEVELS); + u->SendMessage(ChanServ, CHAN_HELP_ACCESS); + u->SendMessage(ChanServ, CHAN_HELP_ACCESS_LEVELS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX); + SyntaxError(ChanServ, u, "ACCESS", CHAN_ACCESS_SYNTAX); } }; @@ -475,7 +470,7 @@ class CommandCSLevels : public Command if (!error.empty()) this->OnSyntaxError(u, "SET"); else if (level <= ACCESS_INVALID || level > ACCESS_FOUNDER) - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + u->SendMessage(ChanServ, CHAN_LEVELS_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); else { for (int i = 0; levelinfo[i].what >= 0; ++i) @@ -489,14 +484,14 @@ class CommandCSLevels : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "SET " << levelinfo[i].name << " to " << level; if (level == ACCESS_FOUNDER) - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_CHANGED_FOUNDER, levelinfo[i].name.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_CHANGED_FOUNDER, levelinfo[i].name.c_str(), ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_CHANGED, levelinfo[i].name.c_str(), ci->name.c_str(), level); + u->SendMessage(ChanServ, CHAN_LEVELS_CHANGED, levelinfo[i].name.c_str(), ci->name.c_str(), level); return MOD_CONT; } } - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str()); } return MOD_CONT; @@ -518,19 +513,19 @@ class CommandCSLevels : public Command bool override = !check_access(u, ci, CA_FOUNDER); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DISABLE " << levelinfo[i].name; - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_DISABLED, levelinfo[i].name.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_DISABLED, levelinfo[i].name.c_str(), ci->name.c_str()); return MOD_CONT; } } - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_UNKNOWN, what.c_str(), Config->s_ChanServ.c_str()); return MOD_CONT; } CommandReturn DoList(User *u, ChannelInfo *ci) { - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_HEADER, ci->name.c_str()); if (!levelinfo_maxwidth) for (int i = 0; levelinfo[i].what >= 0; ++i) @@ -549,14 +544,14 @@ class CommandCSLevels : public Command j = levelinfo[i].what; if (j == CA_AUTOOP || j == CA_AUTODEOP || j == CA_AUTOVOICE || j == CA_NOJOIN) - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_DISABLED, levelinfo_maxwidth, levelinfo[i].name.c_str()); } else if (j == ACCESS_FOUNDER) - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_LIST_FOUNDER, levelinfo_maxwidth, levelinfo[i].name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_FOUNDER, levelinfo_maxwidth, levelinfo[i].name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_LIST_NORMAL, levelinfo_maxwidth, levelinfo[i].name.c_str(), j); + u->SendMessage(ChanServ, CHAN_LEVELS_LIST_NORMAL, levelinfo_maxwidth, levelinfo[i].name.c_str(), j); } return MOD_CONT; @@ -570,7 +565,7 @@ class CommandCSLevels : public Command bool override = !check_access(u, ci, CA_FOUNDER); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "RESET"; - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_RESET, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_LEVELS_RESET, ci->name.c_str()); return MOD_CONT; } @@ -594,9 +589,9 @@ class CommandCSLevels : public Command if (cmd.equals_ci("SET") ? s.empty() : (cmd.substr(0, 3).equals_ci("DIS") ? (what.empty() || !s.empty()) : !what.empty())) this->OnSyntaxError(u, cmd); else if (ci->HasFlag(CI_XOP)) - notice_lang(Config->s_ChanServ, u, CHAN_LEVELS_XOP); + u->SendMessage(ChanServ, CHAN_LEVELS_XOP); else if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("chanserv/access/modify")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (cmd.equals_ci("SET")) this->DoSet(u, ci, params); else if (cmd.equals_ci("DIS") || cmd.equals_ci("DISABLE")) @@ -613,19 +608,34 @@ class CommandCSLevels : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_LEVELS); + if (subcommand == "DESC") + { + int i; + u->SendMessage(ChanServ, CHAN_HELP_LEVELS_DESC); + if (!levelinfo_maxwidth) + for (i = 0; levelinfo[i].what >= 0; ++i) + { + int len = levelinfo[i].name.length(); + if (len > levelinfo_maxwidth) + levelinfo_maxwidth = len; + } + for (i = 0; levelinfo[i].what >= 0; ++i) + u->SendMessage(ChanServ, CHAN_HELP_LEVELS_DESC_FORMAT, levelinfo_maxwidth, levelinfo[i].name.c_str(), GetString(u, levelinfo[i].desc).c_str()); + } + else + u->SendMessage(ChanServ, CHAN_HELP_LEVELS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); + SyntaxError(ChanServ, u, "LEVELS", CHAN_LEVELS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_ACCESS); - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_LEVELS); + u->SendMessage(ChanServ, CHAN_HELP_CMD_ACCESS); + u->SendMessage(ChanServ, CHAN_HELP_CMD_LEVELS); } }; diff --git a/modules/core/cs_akick.cpp b/modules/core/cs_akick.cpp index 5df1a9038..e14d7bffd 100644 --- a/modules/core/cs_akick.cpp +++ b/modules/core/cs_akick.cpp @@ -65,7 +65,7 @@ class AkickListCallback : public NumberList ~AkickListCallback() { if (!SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } virtual void HandleNumber(unsigned Number) @@ -76,7 +76,7 @@ class AkickListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); } DoList(u, ci, Number - 1, ci->GetAkick(Number - 1)); @@ -84,7 +84,7 @@ class AkickListCallback : public NumberList static void DoList(User *u, ChannelInfo *ci, unsigned index, AutoKick *akick) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() :akick->mask.c_str(), !akick->reason.empty() ? akick->reason.c_str() : getstring(u, NO_REASON)); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() :akick->mask.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(u, NO_REASON).c_str()); } }; @@ -103,7 +103,7 @@ class AkickViewCallback : public AkickListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); } DoList(u, ci, Number - 1, ci->GetAkick(Number - 1)); @@ -111,26 +111,16 @@ class AkickViewCallback : public AkickListCallback static void DoList(User *u, ChannelInfo *ci, unsigned index, AutoKick *akick) { - char timebuf[64] = ""; - struct tm tm; - + Anope::string timebuf; if (akick->addtime) - { - tm = *localtime(&akick->addtime); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); - } + timebuf = do_strftime(akick->addtime); else - snprintf(timebuf, sizeof(timebuf), "%s", getstring(u, UNKNOWN)); + timebuf = GetString(u, UNKNOWN); - notice_lang(Config->s_ChanServ, u, akick->HasFlag(AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK : CHAN_AKICK_VIEW_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->creator.empty() ? akick->creator.c_str() : getstring(u, UNKNOWN), timebuf, !akick->reason.empty() ? akick->reason.c_str() : getstring(u, NO_REASON)); + u->SendMessage(ChanServ, akick->HasFlag(AK_STUCK) ? CHAN_AKICK_VIEW_FORMAT_STUCK : CHAN_AKICK_VIEW_FORMAT, index + 1, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), !akick->creator.empty() ? akick->creator.c_str() : GetString(u, UNKNOWN).c_str(), timebuf.c_str(), !akick->reason.empty() ? akick->reason.c_str() : GetString(u, NO_REASON).c_str()); if (akick->last_used) - { - char last_used[64]; - tm = *localtime(&akick->last_used); - strftime_lang(last_used, sizeof(last_used), u, STRFTIME_SHORT_DATE_FORMAT, &tm); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LAST_USED, last_used); - } + u->SendMessage(ChanServ, CHAN_AKICK_LAST_USED, do_strftime(akick->last_used).c_str()); } }; @@ -151,11 +141,11 @@ class AkickDelCallback : public NumberList Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "DEL on " << Deleted << " users"; if (!Deleted) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NO_MATCH, ci->name.c_str()); else if (Deleted == 1) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_DELETED_ONE, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL, Deleted, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_DELETED_SEVERAL, Deleted, ci->name.c_str()); } void HandleNumber(unsigned Number) @@ -189,7 +179,7 @@ class CommandCSAKick : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, NICK_X_FORBIDDEN, mask.c_str()); + u->SendMessage(ChanServ, NICK_X_FORBIDDEN, mask.c_str()); return; } @@ -199,7 +189,7 @@ class CommandCSAKick : public Command /* Check excepts BEFORE we get this far */ if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && is_excepted_mask(ci, mask)) { - notice_lang(Config->s_ChanServ, u, CHAN_EXCEPTED, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_EXCEPTED, mask.c_str(), ci->name.c_str()); return; } @@ -209,7 +199,7 @@ class CommandCSAKick : public Command { if (nc == ci->founder || get_access_level(ci, nc) >= get_access(u, ci)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return; } } @@ -223,7 +213,7 @@ class CommandCSAKick : public Command if ((check_access(u2, ci, CA_FOUNDER) || get_access(u2, ci) >= get_access(u, ci)) && match_usermask(mask, u2)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return; } } @@ -242,7 +232,7 @@ class CommandCSAKick : public Command Anope::string buf = na2->nick + "!" + na2->last_usermask; if (Anope::Match(buf, mask)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return; } } @@ -254,14 +244,14 @@ class CommandCSAKick : public Command akick = ci->GetAkick(j); if (akick->HasFlag(AK_ISNICK) ? akick->nc == nc : mask.equals_ci(akick->mask)) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_ALREADY_EXISTS, akick->HasFlag(AK_ISNICK) ? akick->nc->display.c_str() : akick->mask.c_str(), ci->name.c_str()); return; } } if (ci->GetAkickCount() >= Config->CSAutokickMax) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_REACHED_LIMIT, Config->CSAutokickMax); + u->SendMessage(ChanServ, CHAN_AKICK_REACHED_LIMIT, Config->CSAutokickMax); return; } @@ -275,7 +265,7 @@ class CommandCSAKick : public Command FOREACH_MOD(I_OnAkickAdd, OnAkickAdd(u, ci, akick)); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_ADDED, mask.c_str(), ci->name.c_str()); this->DoEnforce(u, ci); } @@ -290,7 +280,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -309,7 +299,7 @@ class CommandCSAKick : public Command if (i == end) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } @@ -317,7 +307,7 @@ class CommandCSAKick : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "STICK " << akick->mask; akick->SetFlag(AK_STUCK); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name.c_str()); if (ci->c) stick_mask(ci, akick); @@ -333,7 +323,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -352,7 +342,7 @@ class CommandCSAKick : public Command if (i == end) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } @@ -360,7 +350,7 @@ class CommandCSAKick : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "UNSTICK " << akick->mask; akick->UnsetFlag(AK_STUCK); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name.c_str()); } void DoDel(User *u, ChannelInfo *ci, const std::vector<Anope::string> ¶ms) @@ -371,7 +361,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -396,7 +386,7 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } @@ -405,7 +395,7 @@ class CommandCSAKick : public Command ci->EraseAkick(i); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_DELETED, mask.c_str(), ci->name.c_str()); } } @@ -418,7 +408,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -446,14 +436,14 @@ class CommandCSAKick : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); } AkickListCallback::DoList(u, ci, i, akick); } if (!SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } } @@ -466,7 +456,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -494,14 +484,14 @@ class CommandCSAKick : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); } AkickViewCallback::DoList(u, ci, i, akick); } if (!SentHeader) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } } @@ -512,7 +502,7 @@ class CommandCSAKick : public Command if (!c) { - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, ci->name.c_str()); return; } @@ -527,7 +517,7 @@ class CommandCSAKick : public Command bool override = !check_access(u, ci, CA_AKICK); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "ENFORCE, affects " << count << " users"; - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name.c_str(), count); + u->SendMessage(ChanServ, CHAN_AKICK_ENFORCE_DONE, ci->name.c_str(), count); } void DoClear(User *u, ChannelInfo *ci) @@ -536,7 +526,7 @@ class CommandCSAKick : public Command Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "CLEAR"; ci->ClearAkick(); - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_AKICK_CLEAR, ci->name.c_str()); } public: @@ -555,9 +545,9 @@ class CommandCSAKick : public Command if (mask.empty() && (cmd.equals_ci("ADD") || cmd.equals_ci("STICK") || cmd.equals_ci("UNSTICK") || cmd.equals_ci("DEL"))) this->OnSyntaxError(u, cmd); else if (!check_access(u, ci, CA_AKICK) && !u->Account()->HasPriv("chanserv/access/modify")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!cmd.equals_ci("LIST") && !cmd.equals_ci("VIEW") && !cmd.equals_ci("ENFORCE") && readonly) - notice_lang(Config->s_ChanServ, u, CHAN_AKICK_DISABLED); + u->SendMessage(ChanServ, CHAN_AKICK_DISABLED); else if (cmd.equals_ci("ADD")) this->DoAdd(u, ci, params); else if (cmd.equals_ci("STICK")) @@ -582,18 +572,18 @@ class CommandCSAKick : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_AKICK); + u->SendMessage(ChanServ, CHAN_HELP_AKICK); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX); + SyntaxError(ChanServ, u, "AKICK", CHAN_AKICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_AKICK); + u->SendMessage(ChanServ, CHAN_HELP_CMD_AKICK); } }; diff --git a/modules/core/cs_ban.cpp b/modules/core/cs_ban.cpp index fcc11d393..69feaed5b 100644 --- a/modules/core/cs_ban.cpp +++ b/modules/core/cs_ban.cpp @@ -38,21 +38,21 @@ class CommandCSBan : public Command ci = c->ci; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, target.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, target.c_str()); else if (!is_same ? !check_access(u, ci, CA_BAN) : !check_access(u, ci, CA_BANME)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); /* * Dont ban/kick the user on channels where he is excepted * to prevent services <-> server wars. */ else if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && is_excepted(ci, u2)) - notice_lang(Config->s_ChanServ, u, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str()); else if (u2->IsProtected()) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { Anope::string mask; @@ -78,18 +78,18 @@ class CommandCSBan : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_BAN); + u->SendMessage(ChanServ, CHAN_HELP_BAN); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "BAN", CHAN_BAN_SYNTAX); + SyntaxError(ChanServ, u, "BAN", CHAN_BAN_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_BAN); + u->SendMessage(ChanServ, CHAN_HELP_CMD_BAN); } }; diff --git a/modules/core/cs_clear.cpp b/modules/core/cs_clear.cpp index 1fa61fc56..e9763dbdf 100644 --- a/modules/core/cs_clear.cpp +++ b/modules/core/cs_clear.cpp @@ -39,33 +39,33 @@ class CommandCSClear : public Command Log(LOG_COMMAND, u, this, ci) << what; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (!check_access(u, ci, CA_CLEAR)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (what.equals_ci("bans")) { c->ClearBans(); - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_BANS, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_BANS, chan.c_str()); } else if (ModeManager::FindChannelModeByName(CMODE_EXCEPT) && what.equals_ci("excepts")) { c->ClearExcepts(); - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_EXCEPTS, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_EXCEPTS, chan.c_str()); } else if (ModeManager::FindChannelModeByName(CMODE_INVITE) && what.equals_ci("invites")) { c->ClearInvites(); - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_INVITES, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_INVITES, chan.c_str()); } else if (what.equals_ci("modes")) { c->ClearModes(); check_modes(c); - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_MODES, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_MODES, chan.c_str()); } else if (what.equals_ci("ops")) { @@ -105,7 +105,7 @@ class CommandCSClear : public Command } } - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_OPS, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_OPS, chan.c_str()); } else if ((halfop && what.equals_ci("hops")) || (voice && what.equals_ci("voices"))) { @@ -139,28 +139,28 @@ class CommandCSClear : public Command c->Kick(NULL, uc->user, "%s", buf.c_str()); } - notice_lang(Config->s_ChanServ, u, CHAN_CLEARED_USERS, chan.c_str()); + u->SendMessage(ChanServ, CHAN_CLEARED_USERS, chan.c_str()); } else - syntax_error(Config->s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); + SyntaxError(ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_CLEAR); + u->SendMessage(ChanServ, CHAN_HELP_CLEAR); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); + SyntaxError(ChanServ, u, "CLEAR", CHAN_CLEAR_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_CLEAR); + u->SendMessage(ChanServ, CHAN_HELP_CMD_CLEAR); } }; diff --git a/modules/core/cs_drop.cpp b/modules/core/cs_drop.cpp index 4ac066927..64d6ed1c7 100644 --- a/modules/core/cs_drop.cpp +++ b/modules/core/cs_drop.cpp @@ -29,7 +29,7 @@ class CommandCSDrop : public Command if (readonly) { - notice_lang(Config->s_ChanServ, u, CHAN_DROP_DISABLED); // XXX: READ_ONLY_MODE? + u->SendMessage(ChanServ, CHAN_DROP_DISABLED); // XXX: READ_ONLY_MODE? return MOD_CONT; } @@ -37,19 +37,19 @@ class CommandCSDrop : public Command if (ci->HasFlag(CI_FORBIDDEN) && !u->Account()->HasCommand("chanserv/drop")) { - notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_FORBIDDEN, chan.c_str()); return MOD_CONT; } if (ci->HasFlag(CI_SUSPENDED) && !u->Account()->HasCommand("chanserv/drop")) { - notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_FORBIDDEN, chan.c_str()); return MOD_CONT; } if ((ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)) && !u->Account()->HasCommand("chanserv/drop")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -69,7 +69,7 @@ class CommandCSDrop : public Command delete ci; - notice_lang(Config->s_ChanServ, u, CHAN_DROPPED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_DROPPED, chan.c_str()); FOREACH_MOD(I_OnChanDrop, OnChanDrop(chan)); @@ -79,21 +79,21 @@ class CommandCSDrop : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_DROP); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_DROP); else - notice_help(Config->s_ChanServ, u, CHAN_HELP_DROP); + u->SendMessage(ChanServ, CHAN_HELP_DROP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DROP", CHAN_DROP_SYNTAX); + SyntaxError(ChanServ, u, "DROP", CHAN_DROP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DROP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DROP); } }; diff --git a/modules/core/cs_forbid.cpp b/modules/core/cs_forbid.cpp index 706d5e4a8..ef55439b2 100644 --- a/modules/core/cs_forbid.cpp +++ b/modules/core/cs_forbid.cpp @@ -31,19 +31,19 @@ class CommandCSForbid : public Command if (Config->ForceForbidReason && reason.empty()) { - syntax_error(Config->s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX_REASON); + SyntaxError(ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX_REASON); return MOD_CONT; } if (chan[0] != '#') { - notice_lang(Config->s_ChanServ, u, CHAN_SYMBOL_REQUIRED); + u->SendMessage(ChanServ, CHAN_SYMBOL_REQUIRED); return MOD_CONT; } if (readonly) { - notice_lang(Config->s_ChanServ, u, READ_ONLY_MODE); + u->SendMessage(ChanServ, READ_ONLY_MODE); return MOD_CONT; } @@ -55,7 +55,7 @@ class CommandCSForbid : public Command { // this cant happen? //Alog() << Config->s_ChanServ << ": Valid FORBID for " << ci->name << " by " << u->nick << " failed"; - notice_lang(Config->s_ChanServ, u, CHAN_FORBID_FAILED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_FORBID_FAILED, chan.c_str()); return MOD_CONT; } @@ -77,7 +77,7 @@ class CommandCSForbid : public Command if (is_oper(uc->user)) continue; - c->Kick(ChanServ, uc->user, "%s", !reason.empty() ? reason.c_str() : getstring(uc->user->Account(), CHAN_FORBID_REASON)); + c->Kick(ChanServ, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user, CHAN_FORBID_REASON).c_str()); } } @@ -91,7 +91,7 @@ class CommandCSForbid : public Command ircdproto->SendGlobops(ChanServ, "\2%s\2 used FORBID on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); Log(LOG_ADMIN, u, this, ci) << (!ci->forbidreason.empty() ? ci->forbidreason : "No reason"); - notice_lang(Config->s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_FORBID_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci)); @@ -100,18 +100,18 @@ class CommandCSForbid : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_FORBID); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_FORBID); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX); + SyntaxError(ChanServ, u, "FORBID", CHAN_FORBID_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_FORBID); + u->SendMessage(ChanServ, CHAN_HELP_CMD_FORBID); } }; diff --git a/modules/core/cs_getkey.cpp b/modules/core/cs_getkey.cpp index a3e80b424..179af4272 100644 --- a/modules/core/cs_getkey.cpp +++ b/modules/core/cs_getkey.cpp @@ -30,37 +30,37 @@ class CommandCSGetKey : public Command if (!check_access(u, ci, CA_GETKEY) && !u->Account()->HasCommand("chanserv/getkey")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } if (!ci->c || !ci->c->GetParam(CMODE_KEY, key)) { - notice_lang(Config->s_ChanServ, u, CHAN_GETKEY_NOKEY, chan.c_str()); + u->SendMessage(ChanServ, CHAN_GETKEY_NOKEY, chan.c_str()); return MOD_CONT; } bool override = !check_access(u, ci, CA_GETKEY); Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci); - notice_lang(Config->s_ChanServ, u, CHAN_GETKEY_KEY, chan.c_str(), key.c_str()); + u->SendMessage(ChanServ, CHAN_GETKEY_KEY, chan.c_str(), key.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_GETKEY); + u->SendMessage(ChanServ, CHAN_HELP_GETKEY); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX); + SyntaxError(ChanServ, u, "GETKEY", CHAN_GETKEY_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_GETKEY); + u->SendMessage(ChanServ, CHAN_HELP_CMD_GETKEY); } }; diff --git a/modules/core/cs_help.cpp b/modules/core/cs_help.cpp index 2d012fbf6..a8ac4041f 100644 --- a/modules/core/cs_help.cpp +++ b/modules/core/cs_help.cpp @@ -24,38 +24,21 @@ class CommandCSHelp : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { - Anope::string cmd = params[0]; - - if (cmd.equals_ci("LEVELS DESC")) - { - int i; - notice_help(Config->s_ChanServ, u, CHAN_HELP_LEVELS_DESC); - if (!levelinfo_maxwidth) - for (i = 0; levelinfo[i].what >= 0; ++i) - { - int len = levelinfo[i].name.length(); - if (len > levelinfo_maxwidth) - levelinfo_maxwidth = len; - } - for (i = 0; levelinfo[i].what >= 0; ++i) - notice_help(Config->s_ChanServ, u, CHAN_HELP_LEVELS_DESC_FORMAT, levelinfo_maxwidth, levelinfo[i].name.c_str(), getstring(u, levelinfo[i].desc)); - } - else - mod_help_cmd(ChanServ, u, cmd); + mod_help_cmd(ChanServ, u, params[0]); return MOD_CONT; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP); + u->SendMessage(ChanServ, CHAN_HELP); for (CommandMap::const_iterator it = ChanServ->Commands.begin(); it != ChanServ->Commands.end(); ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); if (Config->CSExpire >= 86400) - notice_help(Config->s_ChanServ, u, CHAN_HELP_EXPIRES, Config->CSExpire / 86400); + u->SendMessage(ChanServ, CHAN_HELP_EXPIRES, Config->CSExpire / 86400); if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP); } }; diff --git a/modules/core/cs_info.cpp b/modules/core/cs_info.cpp index b25eeb0ea..d9c507505 100644 --- a/modules/core/cs_info.cpp +++ b/modules/core/cs_info.cpp @@ -19,9 +19,8 @@ class CommandCSInfo : public Command { if (ci->HasFlag(opt)) { - const char *commastr = getstring(nc, COMMA_SPACE); if (!buf.empty()) - buf += commastr; + buf += ", "; buf += str; } @@ -38,20 +37,17 @@ class CommandCSInfo : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { Anope::string chan = params[0]; - char buf[BUFSIZE]; - struct tm *tm; bool has_auspex = u->IsIdentified() && u->Account()->HasPriv("chanserv/auspex"); bool show_all = false; - time_t expt; ChannelInfo *ci = cs_findchan(chan); if (ci->HasFlag(CI_FORBIDDEN)) { if (is_oper(u) && !ci->forbidby.empty()) - notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON)); + u->SendMessage(ChanServ, CHAN_X_FORBIDDEN_OPER, chan.c_str(), ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u, NO_REASON).c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_X_FORBIDDEN, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_FORBIDDEN, chan.c_str()); return MOD_CONT; } @@ -60,66 +56,57 @@ class CommandCSInfo : public Command if (has_auspex || check_access(u, ci, CA_INFO)) show_all = true; - notice_lang(Config->s_ChanServ, u, CHAN_INFO_HEADER, chan.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_FOUNDER, ci->founder->display.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_HEADER, chan.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_NO_FOUNDER, ci->founder->display.c_str()); if (show_all && ci->successor) - notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_SUCCESSOR, ci->successor->display.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_NO_SUCCESSOR, ci->successor->display.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_DESCRIPTION, ci->desc.c_str()); - tm = localtime(&ci->time_registered); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_TIME_REGGED, buf); - tm = localtime(&ci->last_used); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_LAST_USED, buf); + u->SendMessage(ChanServ, CHAN_INFO_DESCRIPTION, ci->desc.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_TIME_REGGED, do_strftime(ci->time_registered).c_str()); + u->SendMessage(ChanServ, CHAN_INFO_LAST_USED, do_strftime(ci->last_used).c_str()); if (!ci->last_topic.empty() && (show_all || (!ci->HasMLock(CMODE_SECRET, true) && (!ci->c || !ci->c->HasMode(CMODE_SECRET))))) { - notice_lang(Config->s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_LAST_TOPIC, ci->last_topic.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str()); } if (!ci->entry_message.empty() && show_all) - notice_lang(Config->s_ChanServ, u, CHAN_INFO_ENTRYMSG, ci->entry_message.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_ENTRYMSG, ci->entry_message.c_str()); if (show_all) { - notice_lang(Config->s_ChanServ, u, CHAN_INFO_BANTYPE, ci->bantype); + u->SendMessage(ChanServ, CHAN_INFO_BANTYPE, ci->bantype); Anope::string optbuf; - CheckOptStr(optbuf, CI_KEEPTOPIC, getstring(u, CHAN_INFO_OPT_KEEPTOPIC), ci, u->Account()); - CheckOptStr(optbuf, CI_OPNOTICE, getstring(u, CHAN_INFO_OPT_OPNOTICE), ci, u->Account()); - CheckOptStr(optbuf, CI_PEACE, getstring(u, CHAN_INFO_OPT_PEACE), ci, u->Account()); - CheckOptStr(optbuf, CI_PRIVATE, getstring(u, CHAN_INFO_OPT_PRIVATE), ci, u->Account()); - CheckOptStr(optbuf, CI_RESTRICTED, getstring(u, CHAN_INFO_OPT_RESTRICTED), ci, u->Account()); - CheckOptStr(optbuf, CI_SECURE, getstring(u, CHAN_INFO_OPT_SECURE), ci, u->Account()); - CheckOptStr(optbuf, CI_SECUREFOUNDER, getstring(u, CHAN_INFO_OPT_SECUREFOUNDER), ci, u->Account()); - CheckOptStr(optbuf, CI_SECUREOPS, getstring(u, CHAN_INFO_OPT_SECUREOPS), ci, u->Account()); + CheckOptStr(optbuf, CI_KEEPTOPIC, GetString(u, CHAN_INFO_OPT_KEEPTOPIC), ci, u->Account()); + CheckOptStr(optbuf, CI_OPNOTICE, GetString(u, CHAN_INFO_OPT_OPNOTICE), ci, u->Account()); + CheckOptStr(optbuf, CI_PEACE, GetString(u, CHAN_INFO_OPT_PEACE), ci, u->Account()); + CheckOptStr(optbuf, CI_PRIVATE, GetString(u, NICK_INFO_OPT_PRIVATE), ci, u->Account()); + CheckOptStr(optbuf, CI_RESTRICTED, GetString(u, CHAN_INFO_OPT_RESTRICTED), ci, u->Account()); + CheckOptStr(optbuf, CI_SECURE, GetString(u, CHAN_INFO_OPT_SECURE), ci, u->Account()); + CheckOptStr(optbuf, CI_SECUREFOUNDER, GetString(u, CHAN_INFO_OPT_SECUREFOUNDER), ci, u->Account()); + CheckOptStr(optbuf, CI_SECUREOPS, GetString(u, CHAN_INFO_OPT_SECUREOPS), ci, u->Account()); if (ci->HasFlag(CI_SIGNKICK)) - CheckOptStr(optbuf, CI_SIGNKICK, getstring(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account()); + CheckOptStr(optbuf, CI_SIGNKICK, GetString(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account()); else - CheckOptStr(optbuf, CI_SIGNKICK_LEVEL, getstring(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account()); - CheckOptStr(optbuf, CI_TOPICLOCK, getstring(u, CHAN_INFO_OPT_TOPICLOCK), ci, u->Account()); - CheckOptStr(optbuf, CI_XOP, getstring(u, CHAN_INFO_OPT_XOP), ci, u->Account()); - CheckOptStr(optbuf, CI_PERSIST, getstring(u, CHAN_INFO_OPT_PERSIST), ci, u->Account()); + CheckOptStr(optbuf, CI_SIGNKICK_LEVEL, GetString(u, CHAN_INFO_OPT_SIGNKICK), ci, u->Account()); + CheckOptStr(optbuf, CI_TOPICLOCK, GetString(u, CHAN_INFO_OPT_TOPICLOCK), ci, u->Account()); + CheckOptStr(optbuf, CI_XOP, GetString(u, CHAN_INFO_OPT_XOP), ci, u->Account()); + CheckOptStr(optbuf, CI_PERSIST, GetString(u, CHAN_INFO_OPT_PERSIST), ci, u->Account()); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_OPTIONS, optbuf.empty() ? getstring(u, CHAN_INFO_OPT_NONE) : optbuf.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1).c_str()); + u->SendMessage(ChanServ, NICK_INFO_OPTIONS, optbuf.empty() ? GetString(u, NICK_INFO_OPT_NONE).c_str() : optbuf.c_str()); + u->SendMessage(ChanServ, CHAN_INFO_MODE_LOCK, get_mlock_modes(ci, 1).c_str()); // XXX: we could just as easily (and tidily) merge this in with the flags display above. if (ci->HasFlag(CI_NO_EXPIRE)) - notice_lang(Config->s_ChanServ, u, CHAN_INFO_NO_EXPIRE); + u->SendMessage(ChanServ, CHAN_INFO_NO_EXPIRE); else - { - expt = ci->last_used + Config->CSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_ChanServ, u, CHAN_INFO_EXPIRE, buf); - } + u->SendMessage(ChanServ, CHAN_INFO_EXPIRE, do_strftime(ci->last_used + Config->CSExpire).c_str()); } if (ci->HasFlag(CI_SUSPENDED)) - notice_lang(Config->s_ChanServ, u, CHAN_X_SUSPENDED, ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : getstring(u, NO_REASON)); + u->SendMessage(ChanServ, CHAN_X_SUSPENDED, ci->forbidby.c_str(), !ci->forbidreason.empty() ? ci->forbidreason.c_str() : GetString(u, NO_REASON).c_str()); FOREACH_MOD(I_OnChanInfo, OnChanInfo(u, ci, show_all)); @@ -128,19 +115,19 @@ class CommandCSInfo : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_INFO); + u->SendMessage(ChanServ, CHAN_HELP_INFO); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "INFO", CHAN_INFO_SYNTAX); + SyntaxError(ChanServ, u, "INFO", CHAN_INFO_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_INFO); + u->SendMessage(ChanServ, CHAN_HELP_CMD_INFO); } }; diff --git a/modules/core/cs_invite.cpp b/modules/core/cs_invite.cpp index c841627a9..ad159a882 100644 --- a/modules/core/cs_invite.cpp +++ b/modules/core/cs_invite.cpp @@ -29,7 +29,7 @@ class CommandCSInvite : public Command if (!(c = findchan(chan))) { - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); return MOD_CONT; } @@ -37,7 +37,7 @@ class CommandCSInvite : public Command if (!check_access(u, ci, CA_INVITE)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -47,7 +47,7 @@ class CommandCSInvite : public Command { if (!(u2 = finduser(params[1]))) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, params[1].c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, params[1].c_str()); return MOD_CONT; } } @@ -56,30 +56,30 @@ class CommandCSInvite : public Command Log(LOG_COMMAND, u, this, ci) << "for " << u2->nick; if (c->FindUser(u2)) - notice_lang(Config->s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name.c_str()); + u->SendMessage(ChanServ, CHAN_INVITE_ALREADY_IN, c->name.c_str()); else { ircdproto->SendInvite(whosends(ci), chan, u2->nick); - notice_lang(whosends(ci)->nick, u, CHAN_INVITE_OTHER_SUCCESS, u2->nick.c_str(), c->name.c_str()); - notice_lang(whosends(ci)->nick, u2, CHAN_INVITE_SUCCESS, c->name.c_str()); + u->SendMessage(whosends(ci), CHAN_INVITE_OTHER_SUCCESS, u2->nick.c_str(), c->name.c_str()); + u->SendMessage(whosends(ci), CHAN_INVITE_SUCCESS, c->name.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_INVITE); + u->SendMessage(ChanServ, CHAN_HELP_INVITE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX); + SyntaxError(ChanServ, u, "INVITE", CHAN_INVITE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_INVITE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_INVITE); } }; diff --git a/modules/core/cs_kick.cpp b/modules/core/cs_kick.cpp index 4deb19b13..267c776e7 100644 --- a/modules/core/cs_kick.cpp +++ b/modules/core/cs_kick.cpp @@ -38,17 +38,17 @@ class CommandCSKick : public Command ci = c->ci; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, target.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, target.c_str()); else if (!is_same ? !check_access(u, ci, CA_KICK) : !check_access(u, ci, CA_KICKME)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!is_same && (ci->HasFlag(CI_PEACE)) && get_access(u2, ci) >= get_access(u, ci)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (u2->IsProtected()) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!c->FindUser(u2)) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else { // XXX @@ -64,18 +64,18 @@ class CommandCSKick : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_KICK); + u->SendMessage(ChanServ, CHAN_HELP_KICK); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "KICK", CHAN_KICK_SYNTAX); + SyntaxError(ChanServ, u, "KICK", CHAN_KICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_KICK); + u->SendMessage(ChanServ, CHAN_HELP_CMD_KICK); } }; diff --git a/modules/core/cs_list.cpp b/modules/core/cs_list.cpp index 3292ec874..8654647fe 100644 --- a/modules/core/cs_list.cpp +++ b/modules/core/cs_list.cpp @@ -33,7 +33,7 @@ public: if (Config->CSListOpersOnly && !is_oper(u)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_STOP; } @@ -42,28 +42,28 @@ public: Anope::string tmp = myStrGetToken(pattern.substr(1), '-', 0); /* Read FROM out */ if (tmp.empty()) { - notice_lang(Config->s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(Config->s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } if (!tmp.is_number_only()) { - notice_lang(Config->s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(Config->s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } from = convertTo<int>(tmp); tmp = myStrGetTokenRemainder(pattern, '-', 1); /* Read TO out */ if (tmp.empty()) { - notice_lang(Config->s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(Config->s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } if (!tmp.is_number_only()) { - notice_lang(Config->s_ChanServ, u, LIST_INCORRECT_RANGE); - notice_lang(Config->s_ChanServ, u, CS_LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, LIST_INCORRECT_RANGE); + u->SendMessage(ChanServ, CS_LIST_INCORRECT_RANGE); return MOD_CONT; } to = convertTo<int>(tmp); @@ -89,7 +89,7 @@ public: Anope::string spattern = "#" + pattern; - notice_lang(Config->s_ChanServ, u, CHAN_LIST_HEADER, pattern.c_str()); + u->SendMessage(ChanServ, NICK_LIST_HEADER, pattern.c_str()); for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it) { @@ -125,24 +125,24 @@ public: } } - notice_lang(Config->s_ChanServ, u, CHAN_LIST_END, nchans > Config->CSListMax ? Config->CSListMax : nchans, nchans); + u->SendMessage(ChanServ, CHAN_LIST_END, nchans > Config->CSListMax ? Config->CSListMax : nchans, nchans); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_LIST); + u->SendMessage(ChanServ, CHAN_HELP_LIST); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "LIST", CHAN_LIST_SYNTAX); + SyntaxError(ChanServ, u, "LIST", NICK_LIST_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_LIST); + u->SendMessage(ChanServ, CHAN_HELP_CMD_LIST); } }; diff --git a/modules/core/cs_modes.cpp b/modules/core/cs_modes.cpp index 54bc09d11..7e616d886 100644 --- a/modules/core/cs_modes.cpp +++ b/modules/core/cs_modes.cpp @@ -35,17 +35,17 @@ static CommandReturn do_util(User *u, Command *com, ChannelMode *cm, const Anope bool is_same = u->nick.equals_ci(realnick); if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (is_same ? !(u2 = u) : !(u2 = finduser(realnick))) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, realnick.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, realnick.c_str()); else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!set && !is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!set && u2->IsProtected() && !is_same) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else if (!c->FindUser(u2)) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else { if (set) @@ -77,18 +77,18 @@ class CommandCSOp : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_OP); + u->SendMessage(ChanServ, CHAN_HELP_OP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "OP", CHAN_OP_SYNTAX); + SyntaxError(ChanServ, u, "OP", CHAN_OP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_OP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_OP); } }; @@ -108,18 +108,18 @@ class CommandCSDeOp : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_DEOP); + u->SendMessage(ChanServ, CHAN_HELP_DEOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX); + SyntaxError(ChanServ, u, "DEOP", CHAN_DEOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DEOP); } }; @@ -139,18 +139,18 @@ class CommandCSVoice : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_VOICE); + u->SendMessage(ChanServ, CHAN_HELP_VOICE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX); + SyntaxError(ChanServ, u, "VOICE", CHAN_VOICE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_VOICE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_VOICE); } }; @@ -170,18 +170,18 @@ class CommandCSDeVoice : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_DEVOICE); + u->SendMessage(ChanServ, CHAN_HELP_DEVOICE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX); + SyntaxError(ChanServ, u, "DEVOICE", CHAN_DEVOICE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEVOICE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DEVOICE); } }; @@ -206,18 +206,18 @@ class CommandCSHalfOp : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_HALFOP); + u->SendMessage(ChanServ, CHAN_HELP_HALFOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX); + SyntaxError(ChanServ, u, "HALFOP", CHAN_HALFOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_HALFOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_HALFOP); } }; @@ -240,18 +240,18 @@ class CommandCSDeHalfOp : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_DEHALFOP); + u->SendMessage(ChanServ, CHAN_HELP_DEHALFOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX); + SyntaxError(ChanServ, u, "DEHALFOP", CHAN_DEHALFOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEHALFOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DEHALFOP); } }; @@ -274,18 +274,18 @@ class CommandCSProtect : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_PROTECT); + u->SendMessage(ChanServ, CHAN_HELP_PROTECT); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX); + SyntaxError(ChanServ, u, "PROTECT", CHAN_PROTECT_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_PROTECT); + u->SendMessage(ChanServ, CHAN_HELP_CMD_PROTECT); } }; @@ -308,18 +308,18 @@ class CommandCSDeProtect : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_DEPROTECT); + u->SendMessage(ChanServ, CHAN_HELP_DEPROTECT); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX); + SyntaxError(ChanServ, u, "DEPROTECT", CHAN_DEPROTECT_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEPROTECT); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DEPROTECT); } }; @@ -342,18 +342,18 @@ class CommandCSOwner : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_OWNER); + u->SendMessage(ChanServ, CHAN_HELP_OWNER); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX); + SyntaxError(ChanServ, u, "OWNER", CHAN_OWNER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_OWNER); + u->SendMessage(ChanServ, CHAN_HELP_CMD_OWNER); } }; @@ -376,18 +376,18 @@ class CommandCSDeOwner : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_DEOWNER); + u->SendMessage(ChanServ, CHAN_HELP_DEOWNER); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX); + SyntaxError(ChanServ, u, "DEOWNER", CHAN_DEOWNER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_DEOWNER); + u->SendMessage(ChanServ, CHAN_HELP_CMD_DEOWNER); } }; diff --git a/modules/core/cs_register.cpp b/modules/core/cs_register.cpp index 545f3f5a1..c488bfc4a 100644 --- a/modules/core/cs_register.cpp +++ b/modules/core/cs_register.cpp @@ -31,30 +31,25 @@ class CommandCSRegister : public Command if (readonly) { - notice_lang(Config->s_ChanServ, u, CHAN_REGISTER_DISABLED); + u->SendMessage(ChanServ, CHAN_REGISTER_DISABLED); return MOD_CONT; } if (chan[0] == '&') - notice_lang(Config->s_ChanServ, u, CHAN_REGISTER_NOT_LOCAL); + u->SendMessage(ChanServ, CHAN_REGISTER_NOT_LOCAL); else if (chan[0] != '#') - notice_lang(Config->s_ChanServ, u, CHAN_SYMBOL_REQUIRED); + u->SendMessage(ChanServ, CHAN_SYMBOL_REQUIRED); else if (!ircdproto->IsChannelValid(chan)) - notice_lang(Config->s_ChanServ, u, CHAN_X_INVALID, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_INVALID, chan.c_str()); else if ((ci = cs_findchan(chan))) - notice_lang(Config->s_ChanServ, u, CHAN_ALREADY_REGISTERED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_ALREADY_REGISTERED, chan.c_str()); else if (c && !c->HasUserStatus(u, CMODE_OP)) - notice_lang(Config->s_ChanServ, u, CHAN_MUST_BE_CHANOP); + u->SendMessage(ChanServ, CHAN_MUST_BE_CHANOP); else if (Config->CSMaxReg && u->Account()->channelcount >= Config->CSMaxReg && !u->Account()->HasPriv("chanserv/no-register-limit")) - notice_lang(Config->s_ChanServ, u, u->Account()->channelcount > Config->CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg); - else if (!(ci = new ChannelInfo(chan))) - { - // not possible ? - //Alog() << Config->s_ChanServ << ": makechan() failed for REGISTER " << chan; - notice_lang(Config->s_ChanServ, u, CHAN_REGISTRATION_FAILED); - } + u->SendMessage(ChanServ, u->Account()->channelcount > Config->CSMaxReg ? CHAN_EXCEEDED_CHANNEL_LIMIT : CHAN_REACHED_CHANNEL_LIMIT, Config->CSMaxReg); else { + ci = new ChannelInfo(chan); ci->founder = u->Account(); ci->desc = desc; @@ -70,7 +65,7 @@ class CommandCSRegister : public Command ci->bi = NULL; ++ci->founder->channelcount; Log(LOG_COMMAND, u, this, ci); - notice_lang(Config->s_ChanServ, u, CHAN_REGISTERED, chan.c_str(), u->nick.c_str()); + u->SendMessage(ChanServ, CHAN_REGISTERED, chan.c_str(), u->nick.c_str()); /* Implement new mode lock */ if (c) @@ -97,13 +92,13 @@ class CommandCSRegister : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_REGISTER, Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_HELP_REGISTER, Config->s_ChanServ.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX); + SyntaxError(ChanServ, u, "REGISTER", CHAN_REGISTER_SYNTAX); } }; diff --git a/modules/core/cs_saset.cpp b/modules/core/cs_saset.cpp index 923848e7a..7d50db325 100644 --- a/modules/core/cs_saset.cpp +++ b/modules/core/cs_saset.cpp @@ -32,7 +32,7 @@ class CommandCSSASet : public Command { if (readonly) { - notice_lang(Config->s_ChanServ, u, CHAN_SET_DISABLED); + u->SendMessage(ChanServ, CHAN_SET_DISABLED); return MOD_CONT; } @@ -49,8 +49,8 @@ class CommandCSSASet : public Command } else { - notice_lang(Config->s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, params[1].c_str()); - notice_lang(Config->s_ChanServ, u, MORE_INFO, Config->s_ChanServ.c_str(), "SET"); + u->SendMessage(ChanServ, NICK_SET_UNKNOWN_OPTION, params[1].c_str()); + u->SendMessage(ChanServ, MORE_INFO, Config->s_ChanServ.c_str(), "SET"); } return MOD_CONT; @@ -60,10 +60,10 @@ class CommandCSSASet : public Command { if (subcommand.empty()) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SASET_HEAD); + u->SendMessage(ChanServ, CHAN_HELP_SASET_HEAD); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(u); - notice_help(Config->s_ChanServ, u, CHAN_HELP_SASET_TAIL); + u->SendMessage(ChanServ, CHAN_HELP_SASET_TAIL); return true; } else @@ -79,12 +79,12 @@ class CommandCSSASet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SASET); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SASET); } bool AddSubcommand(Command *c) diff --git a/modules/core/cs_saset_noexpire.cpp b/modules/core/cs_saset_noexpire.cpp index 125290dc7..388fa88f1 100644 --- a/modules/core/cs_saset_noexpire.cpp +++ b/modules/core/cs_saset_noexpire.cpp @@ -29,12 +29,12 @@ class CommandCSSASetNoexpire : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_NO_EXPIRE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_NOEXPIRE_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_NO_EXPIRE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_NOEXPIRE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "NOEXPIRE"); @@ -44,18 +44,18 @@ class CommandCSSASetNoexpire : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_SET_NOEXPIRE); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_SET_NOEXPIRE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET NOEXPIRE", CHAN_SET_NOEXPIRE_SYNTAX); + SyntaxError(ChanServ, u, "SET NOEXPIRE", CHAN_SET_NOEXPIRE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_NOEXPIRE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_NOEXPIRE); } }; diff --git a/modules/core/cs_set.cpp b/modules/core/cs_set.cpp index ede39c3c7..74c0b9f38 100644 --- a/modules/core/cs_set.cpp +++ b/modules/core/cs_set.cpp @@ -32,12 +32,12 @@ class CommandCSSet : public Command { if (readonly) { - notice_lang(Config->s_ChanServ, u, CHAN_SET_DISABLED); + u->SendMessage(ChanServ, CHAN_SET_DISABLED); return MOD_CONT; } if (!check_access(u, cs_findchan(params[0]), CA_SET)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -53,8 +53,8 @@ class CommandCSSet : public Command } else { - notice_lang(Config->s_ChanServ, u, CHAN_SET_UNKNOWN_OPTION, params[1].c_str()); - notice_lang(Config->s_ChanServ, u, MORE_INFO, Config->s_ChanServ.c_str(), "SET"); + u->SendMessage(ChanServ, NICK_SET_UNKNOWN_OPTION, params[1].c_str()); + u->SendMessage(ChanServ, MORE_INFO, Config->s_ChanServ.c_str(), "SET"); } return MOD_CONT; @@ -64,10 +64,10 @@ class CommandCSSet : public Command { if (subcommand.empty()) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_HEAD); + u->SendMessage(ChanServ, CHAN_HELP_SET_HEAD); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(u); - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_TAIL); + u->SendMessage(ChanServ, CHAN_HELP_SET_TAIL); return true; } else @@ -83,12 +83,12 @@ class CommandCSSet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET); } bool AddSubcommand(Command *c) diff --git a/modules/core/cs_set_bantype.cpp b/modules/core/cs_set_bantype.cpp index afb15781b..628eb10cd 100644 --- a/modules/core/cs_set_bantype.cpp +++ b/modules/core/cs_set_bantype.cpp @@ -31,11 +31,11 @@ class CommandCSSetBanType : public Command int16 bantype = convertTo<int16>(params[1], end, false); if (!end.empty() || bantype < 0 || bantype > 3) - notice_lang(Config->s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, params[1].c_str()); + u->SendMessage(ChanServ, CHAN_SET_BANTYPE_INVALID, params[1].c_str()); else { ci->bantype = bantype; - notice_lang(Config->s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name.c_str(), ci->bantype); + u->SendMessage(ChanServ, CHAN_SET_BANTYPE_CHANGED, ci->name.c_str(), ci->bantype); } return MOD_CONT; @@ -43,19 +43,19 @@ class CommandCSSetBanType : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_BANTYPE, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_BANTYPE, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_BANTYPE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_BANTYPE); } }; @@ -68,14 +68,14 @@ class CommandCSSASetBanType : public CommandCSSetBanType bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_BANTYPE, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_BANTYPE, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_description.cpp b/modules/core/cs_set_description.cpp index 1365de91a..9fe6eb61e 100644 --- a/modules/core/cs_set_description.cpp +++ b/modules/core/cs_set_description.cpp @@ -28,26 +28,26 @@ class CommandCSSetDescription : public Command ci->desc = params[1]; - notice_lang(Config->s_ChanServ, u, CHAN_DESC_CHANGED, ci->name.c_str(), ci->desc.c_str()); + u->SendMessage(ChanServ, CHAN_DESC_CHANGED, ci->name.c_str(), ci->desc.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_DESC, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_DESC, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_DESC); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_DESC); } }; @@ -60,14 +60,14 @@ class CommandCSSASetDescription : public CommandCSSetDescription bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_DESC, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_DESC, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_entrymsg.cpp b/modules/core/cs_set_entrymsg.cpp index 0e864e666..263e37d91 100644 --- a/modules/core/cs_set_entrymsg.cpp +++ b/modules/core/cs_set_entrymsg.cpp @@ -29,12 +29,12 @@ class CommandCSSetEntryMsg : public Command if (params.size() > 1) { ci->entry_message = params[1]; - notice_lang(Config->s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name.c_str(), ci->entry_message.c_str()); + u->SendMessage(ChanServ, CHAN_ENTRY_MSG_CHANGED, ci->name.c_str(), ci->entry_message.c_str()); } else { ci->entry_message.clear(); - notice_lang(Config->s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_ENTRY_MSG_UNSET, ci->name.c_str()); } return MOD_CONT; @@ -42,19 +42,19 @@ class CommandCSSetEntryMsg : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_ENTRYMSG, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_ENTRYMSG); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_ENTRYMSG); } }; @@ -67,14 +67,14 @@ class CommandCSSASetEntryMsg : public CommandCSSetEntryMsg bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_ENTRYMSG, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_ENTRYMSG, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_founder.cpp b/modules/core/cs_set_founder.cpp index ee955d590..a78542d65 100644 --- a/modules/core/cs_set_founder.cpp +++ b/modules/core/cs_set_founder.cpp @@ -28,7 +28,7 @@ class CommandCSSetFounder : public Command if (this->permission.empty() && (ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER))) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -37,19 +37,19 @@ class CommandCSSetFounder : public Command if (!na) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_REGISTERED, params[1].c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_REGISTERED, params[1].c_str()); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(ChanServ, NICK_X_FORBIDDEN, na->nick.c_str()); return MOD_CONT; } nc = na->nc; if (Config->CSMaxReg && nc->channelcount >= Config->CSMaxReg && !u->Account()->HasPriv("chanserv/no-register-limit")) { - notice_lang(Config->s_ChanServ, u, CHAN_SET_FOUNDER_TOO_MANY_CHANS, na->nick.c_str()); + u->SendMessage(ChanServ, CHAN_SET_FOUNDER_TOO_MANY_CHANS, na->nick.c_str()); return MOD_CONT; } @@ -63,26 +63,26 @@ class CommandCSSetFounder : public Command ci->founder = nc; ++nc->channelcount; - notice_lang(Config->s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name.c_str(), na->nick.c_str()); + u->SendMessage(ChanServ, CHAN_FOUNDER_CHANGED, ci->name.c_str(), na->nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_FOUNDER, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_FOUNDER, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_FOUNDER); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_FOUNDER); } }; @@ -95,14 +95,14 @@ class CommandCSSASetFounder : public CommandCSSetFounder bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_FOUNDER, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_FOUNDER, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_keeptopic.cpp b/modules/core/cs_set_keeptopic.cpp index d5b718d71..2f4aa6400 100644 --- a/modules/core/cs_set_keeptopic.cpp +++ b/modules/core/cs_set_keeptopic.cpp @@ -29,12 +29,12 @@ class CommandCSSetKeepTopic : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_KEEPTOPIC); - notice_lang(Config->s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_KEEPTOPIC_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_KEEPTOPIC); - notice_lang(Config->s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_KEEPTOPIC_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "KEEPTOPIC"); @@ -44,18 +44,18 @@ class CommandCSSetKeepTopic : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_KEEPTOPIC, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET KEEPTOPIC", CHAN_SET_KEEPTOPIC_SYNTAX); + SyntaxError(ChanServ, u, "SET KEEPTOPIC", CHAN_SET_KEEPTOPIC_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_KEEPTOPIC); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_KEEPTOPIC); } }; @@ -68,13 +68,13 @@ class CommandCSSASetKeepTopic : public CommandCSSetKeepTopic bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_KEEPTOPIC, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_KEEPTOPIC, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET KEEPTOPIC", CHAN_SASET_KEEPTOPIC_SYNTAX); + SyntaxError(ChanServ, u, "SET KEEPTOPIC", CHAN_SASET_KEEPTOPIC_SYNTAX); } }; diff --git a/modules/core/cs_set_mlock.cpp b/modules/core/cs_set_mlock.cpp index b4c117d05..2556653a2 100644 --- a/modules/core/cs_set_mlock.cpp +++ b/modules/core/cs_set_mlock.cpp @@ -55,7 +55,7 @@ class CommandCSSetMLock : public Command if ((cm = ModeManager::FindChannelModeByChar(*ch))) { if (cm->Type == MODE_STATUS || cm->Type == MODE_LIST || !cm->CanSet(u)) - notice_lang(Config->s_ChanServ, u, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR, *ch); + u->SendMessage(ChanServ, CHAN_SET_MLOCK_IMPOSSIBLE_CHAR, *ch); else if (add) { ci->RemoveMLock(cm->Name); @@ -81,14 +81,14 @@ class CommandCSSetMLock : public Command ci->SetMLock(cm->Name, false); } else - notice_lang(Config->s_ChanServ, u, CHAN_SET_MLOCK_UNKNOWN_CHAR, *ch); + u->SendMessage(ChanServ, CHAN_SET_MLOCK_UNKNOWN_CHAR, *ch); } /* We can't mlock +L if +l is not mlocked as well. */ if (ModeManager::FindChannelModeByName(CMODE_REDIRECT) && ci->HasMLock(CMODE_REDIRECT, true) && !ci->HasMLock(CMODE_LIMIT, true)) { ci->RemoveMLock(CMODE_REDIRECT); - notice_lang(Config->s_ChanServ, u, CHAN_SET_MLOCK_L_REQUIRED); + u->SendMessage(ChanServ, CHAN_SET_MLOCK_L_REQUIRED); } /* Some ircd we can't set NOKNOCK without INVITE */ @@ -96,14 +96,14 @@ class CommandCSSetMLock : public Command if (ModeManager::FindChannelModeByName(CMODE_NOKNOCK) && ircd->knock_needs_i && ci->HasMLock(CMODE_NOKNOCK, true) && !ci->HasMLock(CMODE_INVITE, true)) { ci->RemoveMLock(CMODE_NOKNOCK); - notice_lang(Config->s_ChanServ, u, CHAN_SET_MLOCK_K_REQUIRED); + u->SendMessage(ChanServ, CHAN_SET_MLOCK_K_REQUIRED); } /* Since we always enforce mode r there is no way to have no * mode lock at all. */ if (!get_mlock_modes(ci, 0).empty()) - notice_lang(Config->s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name.c_str(), get_mlock_modes(ci, 0).c_str()); + u->SendMessage(ChanServ, CHAN_MLOCK_CHANGED, ci->name.c_str(), get_mlock_modes(ci, 0).c_str()); /* Implement the new lock. */ if (ci->c) @@ -114,19 +114,19 @@ class CommandCSSetMLock : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_MLOCK, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_MLOCK, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_MLOCK); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_MLOCK); } }; @@ -139,14 +139,14 @@ class CommandCSSASetMLock : public CommandCSSetMLock bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_MLOCK, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_MLOCK, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_opnotice.cpp b/modules/core/cs_set_opnotice.cpp index 6db794d76..41a7c1d22 100644 --- a/modules/core/cs_set_opnotice.cpp +++ b/modules/core/cs_set_opnotice.cpp @@ -29,12 +29,12 @@ class CommandCSSetOpNotice : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_OPNOTICE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_OPNOTICE_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_OPNOTICE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_OPNOTICE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "OPNOTICE"); @@ -44,18 +44,18 @@ class CommandCSSetOpNotice : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_OPNOTICE, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_OPNOTICE, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET OPNOTICE", CHAN_SET_OPNOTICE_SYNTAX); + SyntaxError(ChanServ, u, "SET OPNOTICE", CHAN_SET_OPNOTICE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_OPNOTICE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_OPNOTICE); } }; @@ -68,13 +68,13 @@ class CommandCSSASetOpNotice : public CommandCSSetOpNotice bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_OPNOTICE, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_OPNOTICE, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET OPNOTICE", CHAN_SASET_OPNOTICE_SYNTAX); + SyntaxError(ChanServ, u, "SET OPNOTICE", CHAN_SASET_OPNOTICE_SYNTAX); } }; diff --git a/modules/core/cs_set_peace.cpp b/modules/core/cs_set_peace.cpp index 0c2454f70..e8f2b9458 100644 --- a/modules/core/cs_set_peace.cpp +++ b/modules/core/cs_set_peace.cpp @@ -29,12 +29,12 @@ class CommandCSSetPeace : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_PEACE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PEACE_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_PEACE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PEACE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PEACE"); @@ -44,18 +44,18 @@ class CommandCSSetPeace : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PEACE, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PEACE, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET PEACE", CHAN_SET_PEACE_SYNTAX); + SyntaxError(ChanServ, u, "SET PEACE", CHAN_SET_PEACE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_PEACE, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_PEACE, "SET"); } }; @@ -68,13 +68,13 @@ class CommandCSSASetPeace : public CommandCSSetPeace bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PEACE, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PEACE, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET PEACE", CHAN_SASET_PEACE_SYNTAX); + SyntaxError(ChanServ, u, "SASET PEACE", CHAN_SASET_PEACE_SYNTAX); } }; diff --git a/modules/core/cs_set_persist.cpp b/modules/core/cs_set_persist.cpp index 955e2082f..508ff1cd5 100644 --- a/modules/core/cs_set_persist.cpp +++ b/modules/core/cs_set_persist.cpp @@ -60,7 +60,7 @@ class CommandCSSetPersist : public Command ci->c->SetMode(NULL, cm); } - notice_lang(Config->s_ChanServ, u, CHAN_SET_PERSIST_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PERSIST_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { @@ -82,7 +82,7 @@ class CommandCSSetPersist : public Command ChanServ->UnAssign(NULL, ci); } - notice_lang(Config->s_ChanServ, u, CHAN_SET_PERSIST_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PERSIST_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PERSIST"); @@ -92,18 +92,18 @@ class CommandCSSetPersist : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PERSIST, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PERSIST, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET PERSIST", CHAN_SET_PERSIST_SYNTAX); + SyntaxError(ChanServ, u, "SET PERSIST", CHAN_SET_PERSIST_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_PERSIST); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_PERSIST); } }; @@ -116,13 +116,13 @@ class CommandCSSASetPersist : public CommandCSSetPersist bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PERSIST, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PERSIST, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET PERSIST", CHAN_SASET_PERSIST_SYNTAX); + SyntaxError(ChanServ, u, "SASET PERSIST", CHAN_SASET_PERSIST_SYNTAX); } }; diff --git a/modules/core/cs_set_private.cpp b/modules/core/cs_set_private.cpp index c116fdbbe..73e4968c1 100644 --- a/modules/core/cs_set_private.cpp +++ b/modules/core/cs_set_private.cpp @@ -29,12 +29,12 @@ class CommandCSSetPrivate : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_PRIVATE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PRIVATE_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_PRIVATE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_PRIVATE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PRIVATE"); @@ -44,18 +44,18 @@ class CommandCSSetPrivate : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PRIVATE, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PRIVATE, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET PRIVATE", CHAN_SET_PRIVATE_SYNTAX); + SyntaxError(ChanServ, u, "SET PRIVATE", CHAN_SET_PRIVATE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_PRIVATE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_PRIVATE); } }; @@ -68,13 +68,13 @@ class CommandCSSASetPrivate : public CommandCSSetPrivate bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_PRIVATE, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_PRIVATE, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET PRIVATE", CHAN_SASET_PRIVATE_SYNTAX); + SyntaxError(ChanServ, u, "SASET PRIVATE", CHAN_SASET_PRIVATE_SYNTAX); } }; diff --git a/modules/core/cs_set_restricted.cpp b/modules/core/cs_set_restricted.cpp index bd376cac1..bc8aedf41 100644 --- a/modules/core/cs_set_restricted.cpp +++ b/modules/core/cs_set_restricted.cpp @@ -30,14 +30,14 @@ class CommandCSSetRestricted : public Command ci->SetFlag(CI_RESTRICTED); if (ci->levels[CA_NOJOIN] < 0) ci->levels[CA_NOJOIN] = 0; - notice_lang(Config->s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_RESTRICTED_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_RESTRICTED); if (ci->levels[CA_NOJOIN] >= 0) ci->levels[CA_NOJOIN] = -2; - notice_lang(Config->s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_RESTRICTED_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "RESTRICTED"); @@ -47,18 +47,18 @@ class CommandCSSetRestricted : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_RESTRICTED, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_RESTRICTED, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET RESTRICTED", CHAN_SET_RESTRICTED_SYNTAX); + SyntaxError(ChanServ, u, "SET RESTRICTED", CHAN_SET_RESTRICTED_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_RESTRICTED); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_RESTRICTED); } }; @@ -71,13 +71,13 @@ class CommandCSSASetRestricted : public CommandCSSetRestricted bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_RESTRICTED, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_RESTRICTED, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET RESTRICTED", CHAN_SASET_RESTRICTED_SYNTAX); + SyntaxError(ChanServ, u, "SASET RESTRICTED", CHAN_SASET_RESTRICTED_SYNTAX); } }; diff --git a/modules/core/cs_set_secure.cpp b/modules/core/cs_set_secure.cpp index 53b19b894..bec6bd81f 100644 --- a/modules/core/cs_set_secure.cpp +++ b/modules/core/cs_set_secure.cpp @@ -29,12 +29,12 @@ class CommandCSSetSecure : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_SECURE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECURE_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_SECURE); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECURE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECURE"); @@ -44,18 +44,18 @@ class CommandCSSetSecure : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECURE, "SET", Config->s_NickServ.c_str()); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECURE, "SET", Config->s_NickServ.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET SECURE", CHAN_SET_SECURE_SYNTAX); + SyntaxError(ChanServ, u, "SET SECURE", CHAN_SET_SECURE_SYNTAX); } void OnServHelp(User *u) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_SECURE); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_SECURE); } }; @@ -68,13 +68,13 @@ class CommandCSSASetSecure : public CommandCSSetSecure bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECURE, "SASET", Config->s_NickServ.c_str()); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECURE, "SASET", Config->s_NickServ.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET SECURE", CHAN_SASET_SECURE_SYNTAX); + SyntaxError(ChanServ, u, "SASET SECURE", CHAN_SASET_SECURE_SYNTAX); } }; diff --git a/modules/core/cs_set_securefounder.cpp b/modules/core/cs_set_securefounder.cpp index b31097d01..f5a1af53c 100644 --- a/modules/core/cs_set_securefounder.cpp +++ b/modules/core/cs_set_securefounder.cpp @@ -28,19 +28,19 @@ class CommandCSSetSecureFounder : public Command if (this->permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } if (params[1].equals_ci("ON")) { ci->SetFlag(CI_SECUREFOUNDER); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECUREFOUNDER_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_SECUREFOUNDER); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECUREFOUNDER_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECUREFOUNDER"); @@ -50,18 +50,18 @@ class CommandCSSetSecureFounder : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECUREFOUNDER, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET SECUREFOUNDER", CHAN_SET_SECUREFOUNDER_SYNTAX); + SyntaxError(ChanServ, u, "SET SECUREFOUNDER", CHAN_SET_SECUREFOUNDER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_SECUREFOUNDER); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_SECUREFOUNDER); } }; @@ -74,13 +74,13 @@ class CommandCSSASetSecureFounder : public CommandCSSetSecureFounder bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECUREFOUNDER, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECUREFOUNDER, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET SECUREFOUNDER", CHAN_SASET_SECUREFOUNDER_SYNTAX); + SyntaxError(ChanServ, u, "SASET SECUREFOUNDER", CHAN_SASET_SECUREFOUNDER_SYNTAX); } }; diff --git a/modules/core/cs_set_secureops.cpp b/modules/core/cs_set_secureops.cpp index 0aeadd818..138a03b54 100644 --- a/modules/core/cs_set_secureops.cpp +++ b/modules/core/cs_set_secureops.cpp @@ -29,12 +29,12 @@ class CommandCSSetSecureOps : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_SECUREOPS); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECUREOPS_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_SECUREOPS); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SECUREOPS_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECUREOPS"); @@ -44,18 +44,18 @@ class CommandCSSetSecureOps : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECUREOPS, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECUREOPS, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET SECUREOPS", CHAN_SET_SECUREOPS_SYNTAX); + SyntaxError(ChanServ, u, "SET SECUREOPS", CHAN_SET_SECUREOPS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_SECUREOPS); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_SECUREOPS); } }; @@ -68,13 +68,13 @@ class CommandCSSASetSecureOps : public CommandCSSetSecureOps bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SECUREOPS, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SECUREOPS, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET SECUREOPS", CHAN_SASET_SECUREOPS_SYNTAX); + SyntaxError(ChanServ, u, "SASET SECUREOPS", CHAN_SASET_SECUREOPS_SYNTAX); } }; diff --git a/modules/core/cs_set_signkick.cpp b/modules/core/cs_set_signkick.cpp index 11210524f..cc2ca249b 100644 --- a/modules/core/cs_set_signkick.cpp +++ b/modules/core/cs_set_signkick.cpp @@ -30,19 +30,19 @@ class CommandCSSetSignKick : public Command { ci->SetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SIGNKICK_ON, ci->name.c_str()); } else if (params[1].equals_ci("LEVEL")) { ci->SetFlag(CI_SIGNKICK_LEVEL); ci->UnsetFlag(CI_SIGNKICK); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SIGNKICK_LEVEL, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(Config->s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_SIGNKICK_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SIGNKICK"); @@ -52,18 +52,18 @@ class CommandCSSetSignKick : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SIGNKICK, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SIGNKICK, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET SIGNKICK", CHAN_SET_SIGNKICK_SYNTAX); + SyntaxError(ChanServ, u, "SET SIGNKICK", CHAN_SET_SIGNKICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_SIGNKICK); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_SIGNKICK); } }; @@ -76,13 +76,13 @@ class CommandCSSASetSignKick : public CommandCSSetSignKick bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SIGNKICK, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SIGNKICK, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET SIGNKICK", CHAN_SASET_SIGNKICK_SYNTAX); + SyntaxError(ChanServ, u, "SASET SIGNKICK", CHAN_SASET_SIGNKICK_SYNTAX); } }; diff --git a/modules/core/cs_set_successor.cpp b/modules/core/cs_set_successor.cpp index b4e0972c6..2e3c67044 100644 --- a/modules/core/cs_set_successor.cpp +++ b/modules/core/cs_set_successor.cpp @@ -28,7 +28,7 @@ class CommandCSSetSuccessor : public Command if (this->permission.empty() && ci->HasFlag(CI_SECUREFOUNDER) ? !IsFounder(u, ci) : !check_access(u, ci, CA_FOUNDER)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -40,17 +40,17 @@ class CommandCSSetSuccessor : public Command if (!na) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_REGISTERED, params[1].c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_REGISTERED, params[1].c_str()); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(ChanServ, NICK_X_FORBIDDEN, na->nick.c_str()); return MOD_CONT; } if (na->nc == ci->founder) { - notice_lang(Config->s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, na->nick.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SUCCESSOR_IS_FOUNDER, na->nick.c_str(), ci->name.c_str()); return MOD_CONT; } nc = na->nc; @@ -63,28 +63,28 @@ class CommandCSSetSuccessor : public Command ci->successor = nc; if (nc) - notice_lang(Config->s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name.c_str(), nc->display.c_str()); + u->SendMessage(ChanServ, CHAN_SUCCESSOR_CHANGED, ci->name.c_str(), nc->display.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SUCCESSOR_UNSET, ci->name.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SUCCESSOR, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_SUCCESSOR); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_SUCCESSOR); } }; @@ -97,14 +97,14 @@ class CommandCSSASetSuccessor : public CommandCSSetSuccessor bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_SUCCESSOR, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_SUCCESSOR, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/core/cs_set_topiclock.cpp b/modules/core/cs_set_topiclock.cpp index 4e54267a7..5a6938e0b 100644 --- a/modules/core/cs_set_topiclock.cpp +++ b/modules/core/cs_set_topiclock.cpp @@ -29,12 +29,12 @@ class CommandCSSetTopicLock : public Command if (params[1].equals_ci("ON")) { ci->SetFlag(CI_TOPICLOCK); - notice_lang(Config->s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_TOPICLOCK_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_TOPICLOCK); - notice_lang(Config->s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_TOPICLOCK_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "TOPICLOCK"); @@ -44,18 +44,18 @@ class CommandCSSetTopicLock : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_TOPICLOCK, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_TOPICLOCK_SYNTAX);; + SyntaxError(ChanServ, u, "SET", CHAN_SET_TOPICLOCK_SYNTAX);; } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_TOPICLOCK); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_TOPICLOCK); } }; @@ -68,13 +68,13 @@ class CommandCSSASetTopicLock : public CommandCSSetTopicLock bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_TOPICLOCK, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_TOPICLOCK, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_TOPICLOCK_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_TOPICLOCK_SYNTAX); } }; diff --git a/modules/core/cs_set_xop.cpp b/modules/core/cs_set_xop.cpp index d0c448228..36992d2b8 100644 --- a/modules/core/cs_set_xop.cpp +++ b/modules/core/cs_set_xop.cpp @@ -25,7 +25,7 @@ class CommandCSSetXOP : public Command { if (!FindModule("cs_xop")) { - notice_lang(Config->s_ChanServ, u, CHAN_XOP_NOT_AVAILABLE, "XOP"); + u->SendMessage(ChanServ, CHAN_XOP_NOT_AVAILABLE, "XOP"); return MOD_CONT; } @@ -65,14 +65,14 @@ class CommandCSSetXOP : public Command } Log(LOG_COMMAND, u, this, ci) << "to enable XOP"; - notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_ON, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_XOP_ON, ci->name.c_str()); } else if (params[1].equals_ci("OFF")) { ci->UnsetFlag(CI_XOP); Log(LOG_COMMAND, u, this, ci) << "to disable XOP"; - notice_lang(Config->s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SET_XOP_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "XOP"); @@ -82,18 +82,18 @@ class CommandCSSetXOP : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_XOP, "SET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_XOP, "SET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX); + SyntaxError(ChanServ, u, "SET XOP", CHAN_SET_XOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SET_XOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SET_XOP); } }; @@ -106,13 +106,13 @@ class CommandCSSASetXOP : public CommandCSSetXOP bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SET_XOP, "SASET"); + u->SendMessage(ChanServ, CHAN_HELP_SET_XOP, "SASET"); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET XOP", CHAN_SASET_XOP_SYNTAX); + SyntaxError(ChanServ, u, "SASET XOP", CHAN_SASET_XOP_SYNTAX); } }; diff --git a/modules/core/cs_status.cpp b/modules/core/cs_status.cpp index b97bb540a..d40e721d8 100644 --- a/modules/core/cs_status.cpp +++ b/modules/core/cs_status.cpp @@ -36,28 +36,28 @@ class CommandCSStatus : public Command ci = cs_findchan(chan); } if (!ci) - notice_lang(Config->s_ChanServ, u, CHAN_STATUS_NOT_REGGED, temp.c_str()); + u->SendMessage(ChanServ, CHAN_STATUS_NOT_REGGED, temp.c_str()); else if ((u2 = finduser(nick))) - notice_lang(Config->s_ChanServ, u, CHAN_STATUS_INFO, chan.c_str(), nick.c_str(), get_access(u2, ci)); + u->SendMessage(ChanServ, CHAN_STATUS_INFO, chan.c_str(), nick.c_str(), get_access(u2, ci)); else /* !u2 */ - notice_lang(Config->s_ChanServ, u, CHAN_STATUS_NOTONLINE, nick.c_str()); + u->SendMessage(ChanServ, CHAN_STATUS_NOTONLINE, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_STATUS); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_STATUS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "STATUS", CHAN_STATUS_SYNTAX); + SyntaxError(ChanServ, u, "STATUS", CHAN_STATUS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_STATUS); + u->SendMessage(ChanServ, CHAN_HELP_CMD_STATUS); } }; diff --git a/modules/core/cs_suspend.cpp b/modules/core/cs_suspend.cpp index 055b8b0e7..37d088c2d 100644 --- a/modules/core/cs_suspend.cpp +++ b/modules/core/cs_suspend.cpp @@ -37,19 +37,19 @@ class CommandCSSuspend : public Command if (chan[0] != '#') { - notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_ERROR); + u->SendMessage(ChanServ, CHAN_UNSUSPEND_ERROR); return MOD_CONT; } /* You should not SUSPEND a FORBIDEN channel */ if (ci->HasFlag(CI_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, CHAN_MAY_NOT_BE_REGISTERED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_MAY_NOT_BE_REGISTERED, chan.c_str()); return MOD_CONT; } if (readonly) - notice_lang(Config->s_ChanServ, u, READ_ONLY_MODE); + u->SendMessage(ChanServ, READ_ONLY_MODE); if (ci) { @@ -67,7 +67,7 @@ class CommandCSSuspend : public Command if (is_oper(uc->user)) continue; - c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : getstring(uc->user->Account(), CHAN_SUSPEND_REASON)); + c->Kick(NULL, uc->user, "%s", !reason.empty() ? reason.c_str() : GetString(uc->user->Account(), CHAN_SUSPEND_REASON).c_str()); } } @@ -75,7 +75,7 @@ class CommandCSSuspend : public Command ircdproto->SendGlobops(ChanServ, "\2%s\2 used SUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); Log(LOG_ADMIN, u, this, ci) << (!reason.empty() ? reason : "No reason"); - notice_lang(Config->s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_SUSPEND_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci)); } @@ -83,25 +83,25 @@ class CommandCSSuspend : public Command { // cant happen? //Alog() << Config->s_ChanServ << ": Valid SUSPEND for " << ci->name << " by " << u->GetMask() << " failed"; - notice_lang(Config->s_ChanServ, u, CHAN_SUSPEND_FAILED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_SUSPEND_FAILED, chan.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_SUSPEND); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_SUSPEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "SUSPEND", Config->ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON : CHAN_SUSPEND_SYNTAX); + SyntaxError(ChanServ, u, "SUSPEND", Config->ForceForbidReason ? CHAN_SUSPEND_SYNTAX_REASON : CHAN_SUSPEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SUSPEND); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SUSPEND); } }; @@ -120,16 +120,16 @@ class CommandCSUnSuspend : public Command if (chan[0] != '#') { - notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_ERROR); + u->SendMessage(ChanServ, CHAN_UNSUSPEND_ERROR); return MOD_CONT; } if (readonly) - notice_lang(Config->s_ChanServ, u, READ_ONLY_MODE); + u->SendMessage(ChanServ, READ_ONLY_MODE); /* Only UNSUSPEND already suspended channels */ if (!ci->HasFlag(CI_SUSPENDED)) { - notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_UNSUSPEND_FAILED, chan.c_str()); return MOD_CONT; } @@ -144,7 +144,7 @@ class CommandCSUnSuspend : public Command if (Config->WallForbid) ircdproto->SendGlobops(ChanServ, "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_UNSUSPEND_SUCCEEDED, chan.c_str()); FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci)); } @@ -152,25 +152,25 @@ class CommandCSUnSuspend : public Command { // cant happen ? //Alog() << Config->s_ChanServ << ": Valid UNSUSPEND for " << chan << " by " << u->nick << " failed"; - notice_lang(Config->s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan.c_str()); + u->SendMessage(ChanServ, CHAN_UNSUSPEND_FAILED, chan.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_SERVADMIN_HELP_UNSUSPEND); + u->SendMessage(ChanServ, CHAN_SERVADMIN_HELP_UNSUSPEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX); + SyntaxError(ChanServ, u, "UNSUSPEND", CHAN_UNSUSPEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_UNSUSPEND); + u->SendMessage(ChanServ, CHAN_HELP_CMD_UNSUSPEND); } }; diff --git a/modules/core/cs_topic.cpp b/modules/core/cs_topic.cpp index fbb9a23f4..e178aa9f2 100644 --- a/modules/core/cs_topic.cpp +++ b/modules/core/cs_topic.cpp @@ -29,9 +29,9 @@ class CommandCSTopic : public Command Channel *c = ci->c; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (!check_access(u, ci, CA_TOPIC) && !u->Account()->HasCommand("chanserv/topic")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { bool has_topiclock = ci->HasFlag(CI_TOPICLOCK); @@ -48,18 +48,18 @@ class CommandCSTopic : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_TOPIC); + u->SendMessage(ChanServ, CHAN_HELP_TOPIC); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX); + SyntaxError(ChanServ, u, "TOPIC", CHAN_TOPIC_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_TOPIC); + u->SendMessage(ChanServ, CHAN_HELP_CMD_TOPIC); } }; diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp index ab9bdb4b4..4ac42f9b4 100644 --- a/modules/core/cs_unban.cpp +++ b/modules/core/cs_unban.cpp @@ -28,13 +28,13 @@ class CommandCSUnban : public Command if (!(c = findchan(chan))) { - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); return MOD_CONT; } if (!check_access(u, c->ci, CA_UNBAN)) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -44,32 +44,32 @@ class CommandCSUnban : public Command if (!u2) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, params[1].c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, params[1].c_str()); return MOD_CONT; } common_unban(c->ci, u2->nick); if (u2 == u) - notice_lang(Config->s_ChanServ, u, CHAN_UNBANNED, c->name.c_str()); + u->SendMessage(ChanServ, CHAN_UNBANNED, c->name.c_str()); else - notice_lang(Config->s_ChanServ, u, CHAN_UNBANNED_OTHER, u2->nick.c_str(), c->name.c_str()); + u->SendMessage(ChanServ, CHAN_UNBANNED_OTHER, u2->nick.c_str(), c->name.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_UNBAN); + u->SendMessage(ChanServ, CHAN_HELP_UNBAN); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX); + SyntaxError(ChanServ, u, "UNBAN", CHAN_UNBAN_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_UNBAN); + u->SendMessage(ChanServ, CHAN_HELP_CMD_UNBAN); } }; diff --git a/modules/core/cs_xop.cpp b/modules/core/cs_xop.cpp index 4ebec6926..21785f189 100644 --- a/modules/core/cs_xop.cpp +++ b/modules/core/cs_xop.cpp @@ -41,7 +41,7 @@ enum XOP_MESSAGES }; -int xop_msgs[XOP_TYPES][XOP_MESSAGES] = { +LanguageString xop_msgs[XOP_TYPES][XOP_MESSAGES] = { {CHAN_AOP_DISABLED, CHAN_AOP_NICKS_ONLY, CHAN_AOP_ADDED, @@ -114,10 +114,10 @@ class XOPListCallback : public NumberList User *u; ChannelInfo *ci; int level; - int *messages; + LanguageString *messages; bool SentHeader; public: - XOPListCallback(User *_u, ChannelInfo *_ci, const Anope::string &numlist, int _level, int *_messages) : NumberList(numlist, false), u(_u), ci(_ci), level(_level), messages(_messages), SentHeader(false) + XOPListCallback(User *_u, ChannelInfo *_ci, const Anope::string &numlist, int _level, LanguageString *_messages) : NumberList(numlist, false), u(_u), ci(_ci), level(_level), messages(_messages), SentHeader(false) { } @@ -134,15 +134,15 @@ class XOPListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_HEADER], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_LIST_HEADER], ci->name.c_str()); } DoList(u, ci, access, Number - 1, level, messages); } - static void DoList(User *u, ChannelInfo *ci, ChanAccess *access, unsigned index, int level, int *messages) + static void DoList(User *u, ChannelInfo *ci, ChanAccess *access, unsigned index, int level, LanguageString *messages) { - notice_lang(Config->s_ChanServ, u, CHAN_XOP_LIST_FORMAT, index, access->nc->display.c_str()); + u->SendMessage(ChanServ, CHAN_XOP_LIST_FORMAT, index, access->nc->display.c_str()); } }; @@ -151,27 +151,27 @@ class XOPDelCallback : public NumberList User *u; ChannelInfo *ci; Command *c; - int *messages; + LanguageString *messages; unsigned Deleted; Anope::string Nicks; bool override; public: - XOPDelCallback(User *_u, Command *_c, ChannelInfo *_ci, int *_messages, bool _override, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), c(_c), messages(_messages), Deleted(0), override(_override) + XOPDelCallback(User *_u, Command *_c, ChannelInfo *_ci, LanguageString *_messages, bool _override, const Anope::string &numlist) : NumberList(numlist, true), u(_u), ci(_ci), c(_c), messages(_messages), Deleted(0), override(_override) { } ~XOPDelCallback() { if (!Deleted) - notice_lang(Config->s_ChanServ, u, messages[XOP_NO_MATCH], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_NO_MATCH], ci->name.c_str()); else { Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, c, ci) << "deleted access of users " << Nicks; if (Deleted == 1) - notice_lang(Config->s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_DELETED_ONE], ci->name.c_str()); else - notice_lang(Config->s_ChanServ, u, messages[XOP_DELETED_SEVERAL], Deleted, ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_DELETED_SEVERAL], Deleted, ci->name.c_str()); } } @@ -197,7 +197,7 @@ class XOPDelCallback : public NumberList class XOPBase : public Command { private: - CommandReturn DoAdd(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoAdd(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, LanguageString *messages) { Anope::string nick = params.size() > 2 ? params[2] : ""; ChanAccess *access; @@ -211,7 +211,7 @@ class XOPBase : public Command if (readonly) { - notice_lang(Config->s_ChanServ, u, messages[XOP_DISABLED]); + u->SendMessage(ChanServ, messages[XOP_DISABLED]); return MOD_CONT; } @@ -219,19 +219,19 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } NickAlias *na = findnick(nick); if (!na) { - notice_lang(Config->s_ChanServ, u, messages[XOP_NICKS_ONLY]); + u->SendMessage(ChanServ, messages[XOP_NICKS_ONLY]); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_ChanServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(ChanServ, NICK_X_FORBIDDEN, na->nick.c_str()); return MOD_CONT; } @@ -244,7 +244,7 @@ class XOPBase : public Command **/ if (access->level >= ulev && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } ++change; @@ -252,7 +252,7 @@ class XOPBase : public Command if (!change && ci->GetAccessCount() >= Config->CSAccessMax) { - notice_lang(Config->s_ChanServ, u, CHAN_XOP_REACHED_LIMIT, Config->CSAccessMax); + u->SendMessage(ChanServ, CHAN_XOP_REACHED_LIMIT, Config->CSAccessMax); return MOD_CONT; } @@ -271,18 +271,18 @@ class XOPBase : public Command if (!change) { FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, nc, level)); - notice_lang(Config->s_ChanServ, u, messages[XOP_ADDED], nc->display.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_ADDED], nc->display.c_str(), ci->name.c_str()); } else { FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nc, level)); - notice_lang(Config->s_ChanServ, u, messages[XOP_MOVED], nc->display.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_MOVED], nc->display.c_str(), ci->name.c_str()); } return MOD_CONT; } - CommandReturn DoDel(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoDel(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, LanguageString *messages) { Anope::string nick = params.size() > 2 ? params[2] : ""; ChanAccess *access; @@ -295,13 +295,13 @@ class XOPBase : public Command if (readonly) { - notice_lang(Config->s_ChanServ, u, messages[XOP_DISABLED]); + u->SendMessage(ChanServ, messages[XOP_DISABLED]); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } @@ -309,7 +309,7 @@ class XOPBase : public Command if ((level >= ulev || ulev < ACCESS_AOP) && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -325,7 +325,7 @@ class XOPBase : public Command NickAlias *na = findnick(nick); if (!na) { - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_REGISTERED, nick.c_str()); return MOD_CONT; } NickCore *nc = na->nc; @@ -340,18 +340,18 @@ class XOPBase : public Command if (i == end) { - notice_lang(Config->s_ChanServ, u, messages[XOP_NOT_FOUND], nick.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_NOT_FOUND], nick.c_str(), ci->name.c_str()); return MOD_CONT; } if (ulev <= access->level && !u->Account()->HasPriv("chanserv/access/modify")) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { bool override = ulev <= access->level; Log(override ? LOG_OVERRIDE : LOG_COMMAND, u, this, ci) << "DEL " << access->nc->display; - notice_lang(Config->s_ChanServ, u, messages[XOP_DELETED], access->nc->display.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_DELETED], access->nc->display.c_str(), ci->name.c_str()); FOREACH_MOD(I_OnAccessDel, OnAccessDel(ci, u, na->nc)); @@ -362,13 +362,13 @@ class XOPBase : public Command return MOD_CONT; } - CommandReturn DoList(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, int *messages) + CommandReturn DoList(User *u, const std::vector<Anope::string> ¶ms, ChannelInfo *ci, int level, LanguageString *messages) { Anope::string nick = params.size() > 2 ? params[2] : ""; if (!get_access(u, ci) && !u->Account()->HasCommand("chanserv/access/list")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -377,7 +377,7 @@ class XOPBase : public Command if (!ci->GetAccessCount()) { - notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } @@ -400,36 +400,36 @@ class XOPBase : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_HEADER], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_LIST_HEADER], ci->name.c_str()); } XOPListCallback::DoList(u, ci, access, i, level, messages); } if (!SentHeader) - notice_lang(Config->s_ChanServ, u, messages[XOP_NO_MATCH], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_NO_MATCH], ci->name.c_str()); } return MOD_CONT; } - CommandReturn DoClear(User *u, ChannelInfo *ci, int level, int *messages) + CommandReturn DoClear(User *u, ChannelInfo *ci, int level, LanguageString *messages) { if (readonly) { - notice_lang(Config->s_ChanServ, u, messages[XOP_DISABLED]); + u->SendMessage(ChanServ, messages[XOP_DISABLED]); return MOD_CONT; } if (!ci->GetAccessCount()) { - notice_lang(Config->s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } if (!check_access(u, ci, CA_FOUNDER) && !u->Account()->HasPriv("chanserv/access/modify")) { - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); return MOD_CONT; } @@ -445,12 +445,12 @@ class XOPBase : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(Config->s_ChanServ, u, messages[XOP_CLEAR], ci->name.c_str()); + u->SendMessage(ChanServ, messages[XOP_CLEAR], ci->name.c_str()); return MOD_CONT; } protected: - CommandReturn DoXop(User *u, const std::vector<Anope::string> ¶ms, int level, int *messages) + CommandReturn DoXop(User *u, const std::vector<Anope::string> ¶ms, int level, LanguageString *messages) { Anope::string chan = params[0]; Anope::string cmd = params[1]; @@ -458,7 +458,7 @@ class XOPBase : public Command ChannelInfo *ci = cs_findchan(chan); if (!ci->HasFlag(CI_XOP)) - notice_lang(Config->s_ChanServ, u, CHAN_XOP_ACCESS, Config->s_ChanServ.c_str()); + u->SendMessage(ChanServ, CHAN_XOP_ACCESS, Config->s_ChanServ.c_str()); else if (cmd.equals_ci("ADD")) return this->DoAdd(u, params, ci, level, messages); else if (cmd.equals_ci("DEL")) @@ -503,18 +503,18 @@ class CommandCSQOP : public XOPBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_QOP); + u->SendMessage(ChanServ, CHAN_HELP_QOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "QOP", CHAN_QOP_SYNTAX); + SyntaxError(ChanServ, u, "QOP", CHAN_QOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_QOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_QOP); } }; @@ -532,18 +532,18 @@ class CommandCSAOP : public XOPBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_AOP); + u->SendMessage(ChanServ, CHAN_HELP_AOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "AOP", CHAN_AOP_SYNTAX); + SyntaxError(ChanServ, u, "AOP", CHAN_AOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_AOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_AOP); } }; @@ -561,18 +561,18 @@ class CommandCSHOP : public XOPBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_HOP); + u->SendMessage(ChanServ, CHAN_HELP_HOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "HOP", CHAN_HOP_SYNTAX); + SyntaxError(ChanServ, u, "HOP", CHAN_HOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_HOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_HOP); } }; @@ -590,18 +590,18 @@ class CommandCSSOP : public XOPBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_SOP); + u->SendMessage(ChanServ, CHAN_HELP_SOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "SOP", CHAN_SOP_SYNTAX); + SyntaxError(ChanServ, u, "SOP", CHAN_SOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_SOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_SOP); } }; @@ -619,18 +619,18 @@ class CommandCSVOP : public XOPBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_ChanServ, u, CHAN_HELP_VOP); + u->SendMessage(ChanServ, CHAN_HELP_VOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_ChanServ, u, "VOP", CHAN_VOP_SYNTAX); + SyntaxError(ChanServ, u, "VOP", CHAN_VOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_ChanServ, u, CHAN_HELP_CMD_VOP); + u->SendMessage(ChanServ, CHAN_HELP_CMD_VOP); } }; diff --git a/modules/core/db_plain.cpp b/modules/core/db_plain.cpp index ea366d299..dc108ac06 100644 --- a/modules/core/db_plain.cpp +++ b/modules/core/db_plain.cpp @@ -203,12 +203,6 @@ static void ReadDatabase(Module *m = NULL) db.close(); } -struct LangInfo -{ - Anope::string Name; - int LanguageId; -}; - struct ChannelFlagInfo { Anope::string Name; @@ -233,23 +227,6 @@ struct NickCoreFlagInfo NickCoreFlag Flag; }; -LangInfo LangInfos[] = { - {"en", LANG_EN_US}, - {"es", LANG_ES}, - {"pt", LANG_PT}, - {"fr", LANG_FR}, - {"tr", LANG_TR}, - {"it", LANG_IT}, - {"de", LANG_DE}, - {"ca", LANG_CAT}, - {"gr", LANG_GR}, - {"nl", LANG_NL}, - {"ru", LANG_RU}, - {"hu", LANG_HUN}, - {"pl", LANG_PL}, - {"", -1} -}; - ChannelFlagInfo ChannelInfoFlags[] = { {"KEEPTOPIC", CI_KEEPTOPIC}, {"SECUREOPS", CI_SECUREOPS}, @@ -597,11 +574,7 @@ class DBPlain : public Module EventReturn OnDatabaseReadMetadata(NickCore *nc, const Anope::string &key, const std::vector<Anope::string> ¶ms) { if (key.equals_ci("LANGUAGE")) - { - for (int i = 0; LangInfos[i].LanguageId != -1; ++i) - if (params[0].equals_ci(LangInfos[i].Name)) - nc->language = LangInfos[i].LanguageId; - } + nc->language = params[0]; else if (key.equals_ci("MEMOMAX")) nc->memos.memomax = params[0].is_pos_number_only() ? convertTo<int16>(params[0]) : 1; else if (key.equals_ci("CHANCOUNT")) @@ -890,15 +863,11 @@ class DBPlain : public Module db << "NC " << nc->display << " " << nc->pass << endl; - db << "MD LANGUAGE "; - for (int j = 0; LangInfos[j].LanguageId != -1; ++j) - if (nc->language == LangInfos[j].LanguageId) - db << LangInfos[j].Name; - db << endl; - db << "MD MEMOMAX " << nc->memos.memomax << endl; db << "MD CHANCOUNT " << nc->channelcount << endl; + if (!nc->language.empty()) + db << "MD LANGUAGE " << nc->language << endl; if (!nc->email.empty()) db << "MD EMAIL " << nc->email << endl; if (!nc->greet.empty()) diff --git a/modules/core/hs_del.cpp b/modules/core/hs_del.cpp index 9f3794c25..2908fa3db 100644 --- a/modules/core/hs_del.cpp +++ b/modules/core/hs_del.cpp @@ -28,33 +28,33 @@ class CommandHSDel : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(HostServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } Log(LOG_ADMIN, u, this) << "for user " << na->nick; FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na)); na->hostinfo.RemoveVhost(); - notice_lang(Config->s_HostServ, u, HOST_DEL, nick.c_str()); + u->SendMessage(HostServ, HOST_DEL, nick.c_str()); } else - notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); + u->SendMessage(HostServ, HOST_NOREG, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_DEL); + u->SendMessage(HostServ, HOST_HELP_DEL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_HostServ, u, "DEL", HOST_DEL_SYNTAX); + SyntaxError(HostServ, u, "DEL", HOST_DEL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_DEL); + u->SendMessage(HostServ, HOST_HELP_CMD_DEL); } }; diff --git a/modules/core/hs_delall.cpp b/modules/core/hs_delall.cpp index ca4d804a3..53b08f283 100644 --- a/modules/core/hs_delall.cpp +++ b/modules/core/hs_delall.cpp @@ -28,7 +28,7 @@ class CommandHSDelAll : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(HostServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } FOREACH_MOD(I_OnDeleteVhost, OnDeleteVhost(na)); @@ -39,27 +39,27 @@ class CommandHSDelAll : public Command na->hostinfo.RemoveVhost(); } Log(LOG_ADMIN, u, this) << "for all nicks in group " << nc->display; - notice_lang(Config->s_HostServ, u, HOST_DELALL, nc->display.c_str()); + u->SendMessage(HostServ, HOST_DELALL, nc->display.c_str()); } else - notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); + u->SendMessage(HostServ, HOST_NOREG, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_DELALL); + u->SendMessage(HostServ, HOST_HELP_DELALL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_HostServ, u, "DELALL", HOST_DELALL_SYNTAX); + SyntaxError(HostServ, u, "DELALL", HOST_DELALL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_DELALL); + u->SendMessage(HostServ, HOST_HELP_CMD_DELALL); } }; diff --git a/modules/core/hs_group.cpp b/modules/core/hs_group.cpp index 688d70258..11b56ba07 100644 --- a/modules/core/hs_group.cpp +++ b/modules/core/hs_group.cpp @@ -27,25 +27,25 @@ class CommandHSGroup : public Command { HostServSyncVhosts(na); if (!na->hostinfo.GetIdent().empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_GROUP, u->Account()->display.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); + u->SendMessage(HostServ, HOST_IDENT_GROUP, u->Account()->display.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); else - notice_lang(Config->s_HostServ, u, HOST_GROUP, u->Account()->display.c_str(), na->hostinfo.GetHost().c_str()); + u->SendMessage(HostServ, HOST_GROUP, u->Account()->display.c_str(), na->hostinfo.GetHost().c_str()); } else - notice_lang(Config->s_HostServ, u, HOST_NOT_ASSIGNED); + u->SendMessage(HostServ, HOST_NOT_ASSIGNED); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_GROUP); + u->SendMessage(HostServ, HOST_HELP_GROUP); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_GROUP); + u->SendMessage(HostServ, HOST_HELP_CMD_GROUP); } }; diff --git a/modules/core/hs_help.cpp b/modules/core/hs_help.cpp index 744e0c84d..45d4d2314 100644 --- a/modules/core/hs_help.cpp +++ b/modules/core/hs_help.cpp @@ -29,7 +29,7 @@ class CommandHSHelp : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP, Config->s_HostServ.c_str()); + u->SendMessage(HostServ, OPER_HELP, Config->s_HostServ.c_str()); for (CommandMap::const_iterator it = HostServ->Commands.begin(), it_end = HostServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); diff --git a/modules/core/hs_list.cpp b/modules/core/hs_list.cpp index 7e9332f22..c0408844d 100644 --- a/modules/core/hs_list.cpp +++ b/modules/core/hs_list.cpp @@ -25,8 +25,6 @@ class CommandHSList : public Command Anope::string key = !params.empty() ? params[0] : ""; int from = 0, to = 0, counter = 1; unsigned display_counter = 0; - tm *tm; - char buf[BUFSIZE]; /** * Do a check for a range here, then in the next loop @@ -37,14 +35,14 @@ class CommandHSList : public Command size_t tmp = key.find('-'); if (tmp == Anope::string::npos || tmp == key.length() || tmp == 1) { - notice_lang(Config->s_HostServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(HostServ, LIST_INCORRECT_RANGE); return MOD_CONT; } for (unsigned i = 1, end = key.length(); i < end; ++i) { if (!isdigit(key[i]) && i != tmp) { - notice_lang(Config->s_HostServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(HostServ, LIST_INCORRECT_RANGE); return MOD_CONT; } from = convertTo<int>(key.substr(1, tmp - 1)); @@ -64,13 +62,10 @@ class CommandHSList : public Command if ((Anope::Match(na->nick, key) || Anope::Match(na->hostinfo.GetHost(), key)) && display_counter < Config->NSListMax) { ++display_counter; - time_t time = na->hostinfo.GetTime(); - tm = localtime(&time); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); if (!na->hostinfo.GetIdent().empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), buf); + u->SendMessage(HostServ, HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str()); else - notice_lang(Config->s_HostServ, u, HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), buf); + u->SendMessage(HostServ, HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str()); } } else @@ -82,38 +77,35 @@ class CommandHSList : public Command if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < Config->NSListMax) { ++display_counter; - time_t time = na->hostinfo.GetTime(); - tm = localtime(&time); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); if (!na->hostinfo.GetIdent().empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), buf); + u->SendMessage(HostServ, HOST_IDENT_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str()); else - notice_lang(Config->s_HostServ, u, HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), buf); + u->SendMessage(HostServ, HOST_ENTRY, counter, na->nick.c_str(), na->hostinfo.GetHost().c_str(), na->hostinfo.GetCreator().c_str(), do_strftime(na->hostinfo.GetTime()).c_str()); } } ++counter; } if (!key.empty()) - notice_lang(Config->s_HostServ, u, HOST_LIST_KEY_FOOTER, key.c_str(), display_counter); + u->SendMessage(HostServ, HOST_LIST_KEY_FOOTER, key.c_str(), display_counter); else { if (from) - notice_lang(Config->s_HostServ, u, HOST_LIST_RANGE_FOOTER, from, to); + u->SendMessage(HostServ, HOST_LIST_RANGE_FOOTER, from, to); else - notice_lang(Config->s_HostServ, u, HOST_LIST_FOOTER, display_counter); + u->SendMessage(HostServ, HOST_LIST_FOOTER, display_counter); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_LIST); + u->SendMessage(HostServ, HOST_HELP_LIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_LIST); + u->SendMessage(HostServ, HOST_HELP_CMD_LIST); } }; diff --git a/modules/core/hs_off.cpp b/modules/core/hs_off.cpp index 1338f14b3..535139106 100644 --- a/modules/core/hs_off.cpp +++ b/modules/core/hs_off.cpp @@ -25,12 +25,12 @@ class CommandHSOff : public Command NickAlias *na = findnick(u->nick); if (!na || !na->hostinfo.HasVhost()) - notice_lang(Config->s_HostServ, u, HOST_NOT_ASSIGNED); + u->SendMessage(HostServ, HOST_NOT_ASSIGNED); else { ircdproto->SendVhostDel(u); Log(LOG_COMMAND, u, this) << "to disable their vhost"; - notice_lang(Config->s_HostServ, u, HOST_OFF); + u->SendMessage(HostServ, HOST_OFF); } return MOD_CONT; @@ -38,13 +38,13 @@ class CommandHSOff : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_OFF); + u->SendMessage(HostServ, HOST_HELP_OFF); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_OFF); + u->SendMessage(HostServ, HOST_HELP_CMD_OFF); } }; diff --git a/modules/core/hs_on.cpp b/modules/core/hs_on.cpp index a57b8d8f2..c8e953e73 100644 --- a/modules/core/hs_on.cpp +++ b/modules/core/hs_on.cpp @@ -26,9 +26,9 @@ class CommandHSOn : public Command if (na && u->Account() == na->nc && na->hostinfo.HasVhost()) { if (!na->hostinfo.GetIdent().empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); + u->SendMessage(HostServ, HOST_IDENT_ACTIVATED, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); else - notice_lang(Config->s_HostServ, u, HOST_ACTIVATED, na->hostinfo.GetHost().c_str()); + u->SendMessage(HostServ, HOST_ACTIVATED, na->hostinfo.GetHost().c_str()); Log(LOG_COMMAND, u, this) << "to enable their vhost of " << (!na->hostinfo.GetIdent().empty() ? na->hostinfo.GetIdent() + "@" : "") << na->hostinfo.GetHost(); ircdproto->SendVhost(u, na->hostinfo.GetIdent(), na->hostinfo.GetHost()); if (ircd->vhost) @@ -41,20 +41,20 @@ class CommandHSOn : public Command u->UpdateHost(); } else - notice_lang(Config->s_HostServ, u, HOST_NOT_ASSIGNED); + u->SendMessage(HostServ, HOST_NOT_ASSIGNED); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_ON); + u->SendMessage(HostServ, HOST_HELP_ON); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_ON); + u->SendMessage(HostServ, HOST_HELP_CMD_ON); } }; diff --git a/modules/core/hs_set.cpp b/modules/core/hs_set.cpp index ca554933c..00b7d4556 100644 --- a/modules/core/hs_set.cpp +++ b/modules/core/hs_set.cpp @@ -35,12 +35,12 @@ class CommandHSSet : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (rawhostmask.empty()) { - notice_lang(Config->s_HostServ, u, HOST_SET_SYNTAX, Config->s_HostServ.c_str()); + u->SendMessage(HostServ, HOST_SET_SYNTAX, Config->s_HostServ.c_str()); return MOD_CONT; } if (vIdent.length() > Config->UserLen) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENTTOOLONG, Config->UserLen); + u->SendMessage(HostServ, HOST_SET_IDENTTOOLONG, Config->UserLen); return MOD_CONT; } else @@ -48,13 +48,13 @@ class CommandHSSet : public Command for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s) if (!isvalidchar(*s)) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENT_ERROR); + u->SendMessage(HostServ, HOST_SET_IDENT_ERROR); return MOD_CONT; } } if (!ircd->vident) { - notice_lang(Config->s_HostServ, u, HOST_NO_VIDENT); + u->SendMessage(HostServ, HOST_NO_VIDENT); return MOD_CONT; } } @@ -62,13 +62,13 @@ class CommandHSSet : public Command hostmask = rawhostmask; else { - notice_lang(Config->s_HostServ, u, HOST_SET_TOOLONG, Config->HostLen); + u->SendMessage(HostServ, HOST_SET_TOOLONG, Config->HostLen); return MOD_CONT; } if (!isValidHost(hostmask, 3)) { - notice_lang(Config->s_HostServ, u, HOST_SET_ERROR); + u->SendMessage(HostServ, HOST_SET_ERROR); return MOD_CONT; } @@ -78,7 +78,7 @@ class CommandHSSet : public Command { if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(HostServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } @@ -87,29 +87,29 @@ class CommandHSSet : public Command na->hostinfo.SetVhost(vIdent, hostmask, u->nick); FOREACH_MOD(I_OnSetVhost, OnSetVhost(na)); if (!vIdent.empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_SET, nick.c_str(), vIdent.c_str(), hostmask.c_str()); + u->SendMessage(HostServ, HOST_IDENT_SET, nick.c_str(), vIdent.c_str(), hostmask.c_str()); else - notice_lang(Config->s_HostServ, u, HOST_SET, nick.c_str(), hostmask.c_str()); + u->SendMessage(HostServ, HOST_SET, nick.c_str(), hostmask.c_str()); } else - notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); + u->SendMessage(HostServ, HOST_NOREG, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_SET); + u->SendMessage(HostServ, HOST_HELP_SET); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_HostServ, u, "SET", HOST_SET_SYNTAX); + SyntaxError(HostServ, u, "SET", HOST_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_SET); + u->SendMessage(HostServ, HOST_HELP_CMD_SET); } }; diff --git a/modules/core/hs_setall.cpp b/modules/core/hs_setall.cpp index 715559c5a..304a000b8 100644 --- a/modules/core/hs_setall.cpp +++ b/modules/core/hs_setall.cpp @@ -31,12 +31,12 @@ class CommandHSSetAll : public Command if (!(na = findnick(nick))) { - notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); + u->SendMessage(HostServ, HOST_NOREG, nick.c_str()); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_HostServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(HostServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } @@ -46,12 +46,12 @@ class CommandHSSetAll : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (rawhostmask.empty()) { - notice_lang(Config->s_HostServ, u, HOST_SETALL_SYNTAX, Config->s_HostServ.c_str()); + u->SendMessage(HostServ, HOST_SETALL_SYNTAX, Config->s_HostServ.c_str()); return MOD_CONT; } if (vIdent.length() > Config->UserLen) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENTTOOLONG, Config->UserLen); + u->SendMessage(HostServ, HOST_SET_IDENTTOOLONG, Config->UserLen); return MOD_CONT; } else @@ -59,13 +59,13 @@ class CommandHSSetAll : public Command for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s) if (!isvalidchar(*s)) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENT_ERROR); + u->SendMessage(HostServ, HOST_SET_IDENT_ERROR); return MOD_CONT; } } if (!ircd->vident) { - notice_lang(Config->s_HostServ, u, HOST_NO_VIDENT); + u->SendMessage(HostServ, HOST_NO_VIDENT); return MOD_CONT; } } @@ -74,13 +74,13 @@ class CommandHSSetAll : public Command hostmask = rawhostmask; else { - notice_lang(Config->s_HostServ, u, HOST_SET_TOOLONG, Config->HostLen); + u->SendMessage(HostServ, HOST_SET_TOOLONG, Config->HostLen); return MOD_CONT; } if (!isValidHost(hostmask, 3)) { - notice_lang(Config->s_HostServ, u, HOST_SET_ERROR); + u->SendMessage(HostServ, HOST_SET_ERROR); return MOD_CONT; } @@ -92,26 +92,26 @@ class CommandHSSetAll : public Command HostServSyncVhosts(na); FOREACH_MOD(I_OnSetVhost, OnSetVhost(na)); if (!vIdent.empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_SETALL, nick.c_str(), vIdent.c_str(), hostmask.c_str()); + u->SendMessage(HostServ, HOST_IDENT_SETALL, nick.c_str(), vIdent.c_str(), hostmask.c_str()); else - notice_lang(Config->s_HostServ, u, HOST_SETALL, nick.c_str(), hostmask.c_str()); + u->SendMessage(HostServ, HOST_SETALL, nick.c_str(), hostmask.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_HostServ, u, HOST_HELP_SETALL); + u->SendMessage(HostServ, HOST_HELP_SETALL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_HostServ, u, "SETALL", HOST_SETALL_SYNTAX); + SyntaxError(HostServ, u, "SETALL", HOST_SETALL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_HostServ, u, HOST_HELP_CMD_SETALL); + u->SendMessage(HostServ, HOST_HELP_CMD_SETALL); } }; diff --git a/modules/core/ms_cancel.cpp b/modules/core/ms_cancel.cpp index da31c3261..e9a58c9d5 100644 --- a/modules/core/ms_cancel.cpp +++ b/modules/core/ms_cancel.cpp @@ -31,9 +31,9 @@ class CommandMSCancel : public Command if (!(mi = getmemoinfo(name, ischan, isforbid))) { if (isforbid) - notice_lang(Config->s_MemoServ, u, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name.c_str()); + u->SendMessage(MemoServ, ischan ? CHAN_X_FORBIDDEN : NICK_X_FORBIDDEN, name.c_str()); else - notice_lang(Config->s_MemoServ, u, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str()); + u->SendMessage(MemoServ, ischan ? CHAN_X_NOT_REGISTERED : NICK_X_NOT_REGISTERED, name.c_str()); } else { @@ -44,29 +44,29 @@ class CommandMSCancel : public Command { FOREACH_MOD(I_OnMemoDel, OnMemoDel(findnick(name)->nc, mi, mi->memos[i]->number)); delmemo(mi, mi->memos[i]->number); - notice_lang(Config->s_MemoServ, u, MEMO_CANCELLED, name.c_str()); + u->SendMessage(MemoServ, MEMO_CANCELLED, name.c_str()); return MOD_CONT; } - notice_lang(Config->s_MemoServ, u, MEMO_CANCEL_NONE); + u->SendMessage(MemoServ, MEMO_CANCEL_NONE); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_CANCEL); + u->SendMessage(MemoServ, MEMO_HELP_CANCEL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); + SyntaxError(MemoServ, u, "CANCEL", MEMO_CANCEL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_CANCEL); + u->SendMessage(MemoServ, MEMO_HELP_CMD_CANCEL); } }; diff --git a/modules/core/ms_check.cpp b/modules/core/ms_check.cpp index b0f3b7feb..f6d9e9833 100644 --- a/modules/core/ms_check.cpp +++ b/modules/core/ms_check.cpp @@ -26,18 +26,16 @@ class CommandMSCheck : public Command MemoInfo *mi = NULL; int i, found = 0; Anope::string recipient = params[0]; - struct tm *tm; - char timebuf[64]; if (!(na = findnick(recipient))) { - notice_lang(Config->s_MemoServ, u, NICK_X_NOT_REGISTERED, recipient.c_str()); + u->SendMessage(MemoServ, NICK_X_NOT_REGISTERED, recipient.c_str()); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_MemoServ, u, NICK_X_FORBIDDEN, recipient.c_str()); + u->SendMessage(MemoServ, NICK_X_FORBIDDEN, recipient.c_str()); return MOD_CONT; } @@ -52,37 +50,34 @@ class CommandMSCheck : public Command { found = 1; /* Yes, we've found the memo */ - tm = localtime(&mi->memos[i]->time); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); - if (mi->memos[i]->HasFlag(MF_UNREAD)) - notice_lang(Config->s_MemoServ, u, MEMO_CHECK_NOT_READ, na->nick.c_str(), timebuf); + u->SendMessage(MemoServ, MEMO_CHECK_NOT_READ, na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_CHECK_READ, na->nick.c_str(), timebuf); + u->SendMessage(MemoServ, MEMO_CHECK_READ, na->nick.c_str(), do_strftime(mi->memos[i]->time).c_str()); break; } } if (!found) - notice_lang(Config->s_MemoServ, u, MEMO_CHECK_NO_MEMO, na->nick.c_str()); + u->SendMessage(MemoServ, MEMO_CHECK_NO_MEMO, na->nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_CHECK); + u->SendMessage(MemoServ, MEMO_HELP_CHECK); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX); + SyntaxError(MemoServ, u, "CHECK", MEMO_CHECK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_CHECK); + u->SendMessage(MemoServ, MEMO_HELP_CMD_CHECK); } }; diff --git a/modules/core/ms_del.cpp b/modules/core/ms_del.cpp index 8ffed7532..9c298c0be 100644 --- a/modules/core/ms_del.cpp +++ b/modules/core/ms_del.cpp @@ -59,17 +59,17 @@ class CommandMSDel : public Command if (!(ci = cs_findchan(chan))) { - notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + u->SendMessage(MemoServ, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (readonly) { - notice_lang(Config->s_MemoServ, u, READ_ONLY_MODE); + u->SendMessage(MemoServ, READ_ONLY_MODE); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -81,9 +81,9 @@ class CommandMSDel : public Command else if (mi->memos.empty()) { if (!chan.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + u->SendMessage(MemoServ, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + u->SendMessage(MemoServ, MEMO_HAVE_NO_MEMOS); } else { @@ -102,7 +102,7 @@ class CommandMSDel : public Command else FOREACH_MOD(I_OnMemoDel, OnMemoDel(u->Account(), mi, last)); delmemo(mi, last); - notice_lang(Config->s_MemoServ, u, MEMO_DELETED_ONE, last); + u->SendMessage(MemoServ, MEMO_DELETED_ONE, last); } else { @@ -115,9 +115,9 @@ class CommandMSDel : public Command delete mi->memos[i]; mi->memos.clear(); if (!chan.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_CHAN_DELETED_ALL, chan.c_str()); + u->SendMessage(MemoServ, MEMO_CHAN_DELETED_ALL, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_DELETED_ALL); + u->SendMessage(MemoServ, MEMO_DELETED_ALL); } /* Reset the order */ @@ -129,18 +129,18 @@ class CommandMSDel : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_DEL); + u->SendMessage(MemoServ, MEMO_HELP_DEL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "DEL", MEMO_DEL_SYNTAX); + SyntaxError(MemoServ, u, "DEL", MEMO_DEL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_DEL); + u->SendMessage(MemoServ, MEMO_HELP_CMD_DEL); } }; diff --git a/modules/core/ms_help.cpp b/modules/core/ms_help.cpp index a82c8200e..3f1e82798 100644 --- a/modules/core/ms_help.cpp +++ b/modules/core/ms_help.cpp @@ -29,11 +29,11 @@ class CommandMSHelp : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_HEADER); + u->SendMessage(MemoServ, MEMO_HELP_HEADER); for (CommandMap::const_iterator it = MemoServ->Commands.begin(), it_end = MemoServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); - notice_help(Config->s_MemoServ, u, MEMO_HELP_FOOTER, Config->s_ChanServ.c_str()); + u->SendMessage(MemoServ, MEMO_HELP_FOOTER, Config->s_ChanServ.c_str()); } }; diff --git a/modules/core/ms_info.cpp b/modules/core/ms_info.cpp index 2dfb6398d..9c0d07a55 100644 --- a/modules/core/ms_info.cpp +++ b/modules/core/ms_info.cpp @@ -33,12 +33,12 @@ class CommandMSInfo : public Command na = findnick(name); if (!na) { - notice_lang(Config->s_MemoServ, u, NICK_X_NOT_REGISTERED, name.c_str()); + u->SendMessage(MemoServ, NICK_X_NOT_REGISTERED, name.c_str()); return MOD_CONT; } else if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_MemoServ, u, NICK_X_FORBIDDEN, name.c_str()); + u->SendMessage(MemoServ, NICK_X_FORBIDDEN, name.c_str()); return MOD_CONT; } mi = &na->nc->memos; @@ -48,12 +48,12 @@ class CommandMSInfo : public Command { if (!(ci = cs_findchan(name))) { - notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, name.c_str()); + u->SendMessage(MemoServ, CHAN_X_NOT_REGISTERED, name.c_str()); return MOD_CONT; } else if (!check_access(u, ci, CA_MEMO)) { - notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -61,7 +61,7 @@ class CommandMSInfo : public Command } else if (!name.empty()) /* It's not a chan and we aren't services admin */ { - notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } else @@ -73,13 +73,13 @@ class CommandMSInfo : public Command if (!name.empty() && (ci || na->nc != u->Account())) { if (mi->memos.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NO_MEMOS, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NO_MEMOS, name.c_str()); else if (mi->memos.size() == 1) { if (mi->memos[0]->HasFlag(MF_UNREAD)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMO_UNREAD, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMO_UNREAD, name.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMO, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMO, name.c_str()); } else { @@ -88,55 +88,55 @@ class CommandMSInfo : public Command if (mi->memos[i]->HasFlag(MF_UNREAD)) ++count; if (count == mi->memos.size()) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMOS_ALL_UNREAD, name.c_str(), count); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMOS_ALL_UNREAD, name.c_str(), count); else if (!count) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMOS, name.c_str(), mi->memos.size()); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMOS, name.c_str(), mi->memos.size()); else if (count == 1) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMOS_ONE_UNREAD, name.c_str(), mi->memos.size()); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMOS_ONE_UNREAD, name.c_str(), mi->memos.size()); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_MEMOS_SOME_UNREAD, name.c_str(), mi->memos.size(), count); + u->SendMessage(MemoServ, MEMO_INFO_X_MEMOS_SOME_UNREAD, name.c_str(), mi->memos.size(), count); } if (!mi->memomax) { if (hardmax) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name.c_str(), mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_X_HARD_LIMIT, name.c_str(), mi->memomax); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_LIMIT, name.c_str(), mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_X_LIMIT, name.c_str(), mi->memomax); } else if (mi->memomax > 0) { if (hardmax) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_HARD_LIMIT, name.c_str(), mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_X_HARD_LIMIT, name.c_str(), mi->memomax); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_LIMIT, name.c_str(), mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_X_LIMIT, name.c_str(), mi->memomax); } else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NO_LIMIT, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NO_LIMIT, name.c_str()); /* I ripped this code out of ircservices 4.4.5, since I didn't want to rewrite the whole thing (it pisses me off). */ if (na) { if (na->nc->HasFlag(NI_MEMO_RECEIVE) && na->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NOTIFY_ON, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NOTIFY_ON, name.c_str()); else if (na->nc->HasFlag(NI_MEMO_RECEIVE)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NOTIFY_RECEIVE, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NOTIFY_RECEIVE, name.c_str()); else if (na->nc->HasFlag(NI_MEMO_SIGNON)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NOTIFY_SIGNON, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NOTIFY_SIGNON, name.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_X_NOTIFY_OFF, name.c_str()); + u->SendMessage(MemoServ, MEMO_INFO_X_NOTIFY_OFF, name.c_str()); } } else /* !name || (!ci || na->nc == u->Account()) */ { if (mi->memos.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NO_MEMOS); + u->SendMessage(MemoServ, MEMO_INFO_NO_MEMOS); else if (mi->memos.size() == 1) { if (mi->memos[0]->HasFlag(MF_UNREAD)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMO_UNREAD); + u->SendMessage(MemoServ, MEMO_INFO_MEMO_UNREAD); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMO); + u->SendMessage(MemoServ, MEMO_INFO_MEMO); } else { @@ -145,41 +145,41 @@ class CommandMSInfo : public Command if (mi->memos[i]->HasFlag(MF_UNREAD)) ++count; if (count == mi->memos.size()) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMOS_ALL_UNREAD, count); + u->SendMessage(MemoServ, MEMO_INFO_MEMOS_ALL_UNREAD, count); else if (!count) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMOS, mi->memos.size()); + u->SendMessage(MemoServ, MEMO_INFO_MEMOS, mi->memos.size()); else if (count == 1) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMOS_ONE_UNREAD, mi->memos.size()); + u->SendMessage(MemoServ, MEMO_INFO_MEMOS_ONE_UNREAD, mi->memos.size()); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_MEMOS_SOME_UNREAD, mi->memos.size(), count); + u->SendMessage(MemoServ, MEMO_INFO_MEMOS_SOME_UNREAD, mi->memos.size(), count); } if (!mi->memomax) { if (!u->Account()->IsServicesOper() && hardmax) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_HARD_LIMIT_ZERO); + u->SendMessage(MemoServ, MEMO_INFO_HARD_LIMIT_ZERO); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_LIMIT_ZERO); + u->SendMessage(MemoServ, MEMO_INFO_LIMIT_ZERO); } else if (mi->memomax > 0) { if (!u->Account()->IsServicesOper() && hardmax) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_HARD_LIMIT, mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_HARD_LIMIT, mi->memomax); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_LIMIT, mi->memomax); + u->SendMessage(MemoServ, MEMO_INFO_LIMIT, mi->memomax); } else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NO_LIMIT); + u->SendMessage(MemoServ, MEMO_INFO_NO_LIMIT); /* Ripped too. But differently because of a seg fault (loughs) */ if (u->Account()->HasFlag(NI_MEMO_RECEIVE) && u->Account()->HasFlag(NI_MEMO_SIGNON)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NOTIFY_ON); + u->SendMessage(MemoServ, MEMO_INFO_NOTIFY_ON); else if (u->Account()->HasFlag(NI_MEMO_RECEIVE)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NOTIFY_RECEIVE); + u->SendMessage(MemoServ, MEMO_INFO_NOTIFY_RECEIVE); else if (u->Account()->HasFlag(NI_MEMO_SIGNON)) - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NOTIFY_SIGNON); + u->SendMessage(MemoServ, MEMO_INFO_NOTIFY_SIGNON); else - notice_lang(Config->s_MemoServ, u, MEMO_INFO_NOTIFY_OFF); + u->SendMessage(MemoServ, MEMO_INFO_NOTIFY_OFF); } return MOD_CONT; } @@ -187,16 +187,16 @@ class CommandMSInfo : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_MemoServ, u, MEMO_SERVADMIN_HELP_INFO); + u->SendMessage(MemoServ, MEMO_SERVADMIN_HELP_INFO); else - notice_help(Config->s_MemoServ, u, MEMO_HELP_INFO); + u->SendMessage(MemoServ, MEMO_HELP_INFO); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_INFO); + u->SendMessage(MemoServ, MEMO_HELP_CMD_INFO); } }; diff --git a/modules/core/ms_list.cpp b/modules/core/ms_list.cpp index dc9b0c6bc..1cd64f0cb 100644 --- a/modules/core/ms_list.cpp +++ b/modules/core/ms_list.cpp @@ -33,11 +33,11 @@ class MemoListCallback : public NumberList { SentHeader = true; if (ci) - notice_lang(Config->s_MemoServ, u, MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str()); + u->SendMessage(MemoServ, MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_LIST_MEMOS, u->nick.c_str(), Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_LIST_MEMOS, u->nick.c_str(), Config->s_MemoServ.c_str()); - notice_lang(Config->s_MemoServ, u, MEMO_LIST_HEADER); + u->SendMessage(MemoServ, MEMO_LIST_HEADER); } DoList(u, ci, mi, Number - 1); @@ -46,11 +46,7 @@ class MemoListCallback : public NumberList static void DoList(User *u, ChannelInfo *ci, const MemoInfo *mi, unsigned index) { Memo *m = mi->memos[index]; - struct tm tm = *localtime(&m->time); - char timebuf[64]; - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); - timebuf[sizeof(timebuf) - 1] = 0; /* just in case */ - notice_lang(Config->s_MemoServ, u, MEMO_LIST_FORMAT, (m->HasFlag(MF_UNREAD)) ? '*' : ' ', m->number, m->sender.c_str(), timebuf); + u->SendMessage(MemoServ, MEMO_LIST_FORMAT, (m->HasFlag(MF_UNREAD)) ? '*' : ' ', m->number, m->sender.c_str(), do_strftime(m->time).c_str()); } }; @@ -75,12 +71,12 @@ class CommandMSList : public Command if (!(ci = cs_findchan(chan))) { - notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + u->SendMessage(MemoServ, 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); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -92,9 +88,9 @@ class CommandMSList : public Command else if (!mi->memos.size()) { if (!chan.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_X_HAS_NO_MEMOS, chan.c_str()); + u->SendMessage(MemoServ, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + u->SendMessage(MemoServ, MEMO_HAVE_NO_MEMOS); } else { @@ -113,9 +109,9 @@ class CommandMSList : public Command if (i == end) { if (!chan.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); + u->SendMessage(MemoServ, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); + u->SendMessage(MemoServ, MEMO_HAVE_NO_NEW_MEMOS); return MOD_CONT; } } @@ -131,10 +127,10 @@ class CommandMSList : public Command { SentHeader = true; if (ci) - notice_lang(Config->s_MemoServ, u, !param.empty() ? MEMO_LIST_CHAN_NEW_MEMOS : MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str()); + u->SendMessage(MemoServ, !param.empty() ? MEMO_LIST_CHAN_NEW_MEMOS : MEMO_LIST_CHAN_MEMOS, ci->name.c_str(), Config->s_MemoServ.c_str(), ci->name.c_str()); else - notice_lang(Config->s_MemoServ, u, !param.empty() ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS, u->nick.c_str(), Config->s_MemoServ.c_str()); - notice_lang(Config->s_MemoServ, u, MEMO_LIST_HEADER); + u->SendMessage(MemoServ, !param.empty() ? MEMO_LIST_NEW_MEMOS : MEMO_LIST_MEMOS, u->nick.c_str(), Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_LIST_HEADER); } MemoListCallback::DoList(u, ci, mi, i); @@ -146,18 +142,18 @@ class CommandMSList : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_LIST); + u->SendMessage(MemoServ, MEMO_HELP_LIST); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "LIST", MEMO_LIST_SYNTAX); + SyntaxError(MemoServ, u, "LIST", MEMO_LIST_SYNTAX); } void OnServCommand(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_LIST); + u->SendMessage(MemoServ, MEMO_HELP_CMD_LIST); } }; diff --git a/modules/core/ms_read.cpp b/modules/core/ms_read.cpp index 80e1d5bf6..1828992bb 100644 --- a/modules/core/ms_read.cpp +++ b/modules/core/ms_read.cpp @@ -33,15 +33,11 @@ class MemoListCallback : public NumberList static void DoRead(User *u, MemoInfo *mi, ChannelInfo *ci, unsigned index) { Memo *m = mi->memos[index]; - struct tm tm = *localtime(&m->time); - char timebuf[64]; - 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); + u->SendMessage(MemoServ, MEMO_CHAN_HEADER, m->number, m->sender.c_str(), do_strftime(m->time).c_str(), 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()); + u->SendMessage(MemoServ, MEMO_HEADER, m->number, m->sender.c_str(), do_strftime(m->time).c_str(), Config->s_MemoServ.c_str(), m->number); + u->SendMessage(MemoServ, MEMO_TEXT, m->text.c_str()); m->UnsetFlag(MF_UNREAD); /* Check if a receipt notification was requested */ @@ -71,12 +67,12 @@ class CommandMSRead : public Command if (!(ci = cs_findchan(chan))) { - notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + u->SendMessage(MemoServ, 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); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -89,9 +85,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()); + u->SendMessage(MemoServ, MEMO_X_HAS_NO_MEMOS, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_MEMOS); + u->SendMessage(MemoServ, MEMO_HAVE_NO_MEMOS); } else { int i, end; @@ -108,9 +104,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()); + u->SendMessage(MemoServ, MEMO_X_HAS_NO_NEW_MEMOS, chan.c_str()); else - notice_lang(Config->s_MemoServ, u, MEMO_HAVE_NO_NEW_MEMOS); + u->SendMessage(MemoServ, MEMO_HAVE_NO_NEW_MEMOS); } } else if (numstr.equals_ci("LAST")) @@ -129,18 +125,18 @@ class CommandMSRead : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_READ); + u->SendMessage(MemoServ, MEMO_HELP_READ); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "READ", MEMO_READ_SYNTAX); + SyntaxError(MemoServ, u, "READ", MEMO_READ_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_READ); + u->SendMessage(MemoServ, MEMO_HELP_CMD_READ); } }; diff --git a/modules/core/ms_rsend.cpp b/modules/core/ms_rsend.cpp index 6ed6b3b03..01b46fbe7 100644 --- a/modules/core/ms_rsend.cpp +++ b/modules/core/ms_rsend.cpp @@ -29,7 +29,7 @@ class CommandMSRSend : public Command /* prevent user from rsend to themselves */ if ((na = findnick(nick)) && na->nc == u->Account()) { - notice_lang(Config->s_MemoServ, u, MEMO_NO_RSEND_SELF); + u->SendMessage(MemoServ, MEMO_NO_RSEND_SELF); return MOD_CONT; } @@ -39,7 +39,7 @@ class CommandMSRSend : public Command if (u->Account()->IsServicesOper()) memo_send(u, nick, text, 3); else - notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); + u->SendMessage(MemoServ, ACCESS_DENIED); } else if (Config->MSMemoReceipt == 2) /* Everybody can use rsend */ @@ -48,7 +48,7 @@ class CommandMSRSend : public Command { /* rsend has been disabled */ Log() << "MSMemoReceipt is set misconfigured to " << Config->MSMemoReceipt; - notice_lang(Config->s_MemoServ, u, MEMO_RSEND_DISABLED); + u->SendMessage(MemoServ, MEMO_RSEND_DISABLED); } return MOD_CONT; @@ -56,18 +56,18 @@ class CommandMSRSend : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_RSEND); + u->SendMessage(MemoServ, MEMO_HELP_RSEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); + SyntaxError(MemoServ, u, "RSEND", MEMO_RSEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_RSEND); + u->SendMessage(MemoServ, MEMO_HELP_CMD_RSEND); } }; diff --git a/modules/core/ms_send.cpp b/modules/core/ms_send.cpp index 015302a8e..9cc361f4e 100644 --- a/modules/core/ms_send.cpp +++ b/modules/core/ms_send.cpp @@ -30,18 +30,18 @@ class CommandMSSend : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_SEND); + u->SendMessage(MemoServ, MEMO_HELP_SEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "SEND", MEMO_SEND_SYNTAX); + SyntaxError(MemoServ, u, "SEND", MEMO_SEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_SEND); + u->SendMessage(MemoServ, MEMO_HELP_CMD_SEND); } }; diff --git a/modules/core/ms_sendall.cpp b/modules/core/ms_sendall.cpp index e15b8ae93..b16e13929 100644 --- a/modules/core/ms_sendall.cpp +++ b/modules/core/ms_sendall.cpp @@ -26,7 +26,7 @@ class CommandMSSendAll : public Command if (readonly) { - notice_lang(Config->s_MemoServ, u, MEMO_SEND_DISABLED); + u->SendMessage(MemoServ, MEMO_SEND_DISABLED); return MOD_CONT; } @@ -40,24 +40,24 @@ class CommandMSSendAll : public Command memo_send(u, nc->display, text, 1); } - notice_lang(Config->s_MemoServ, u, MEMO_MASS_SENT); + u->SendMessage(MemoServ, MEMO_MASS_SENT); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_SENDALL); + u->SendMessage(MemoServ, MEMO_HELP_SENDALL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX); + SyntaxError(MemoServ, u, "SENDALL", MEMO_SEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_SENDALL); + u->SendMessage(MemoServ, MEMO_HELP_CMD_SENDALL); } }; diff --git a/modules/core/ms_set.cpp b/modules/core/ms_set.cpp index bb065974d..a49e849f1 100644 --- a/modules/core/ms_set.cpp +++ b/modules/core/ms_set.cpp @@ -24,44 +24,44 @@ class CommandMSSet : public Command { u->Account()->SetFlag(NI_MEMO_SIGNON); u->Account()->SetFlag(NI_MEMO_RECEIVE); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_ON, Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_ON, Config->s_MemoServ.c_str()); } else if (param.equals_ci("LOGON")) { u->Account()->SetFlag(NI_MEMO_SIGNON); u->Account()->UnsetFlag(NI_MEMO_RECEIVE); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_LOGON, Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_LOGON, Config->s_MemoServ.c_str()); } else if (param.equals_ci("NEW")) { u->Account()->UnsetFlag(NI_MEMO_SIGNON); u->Account()->SetFlag(NI_MEMO_RECEIVE); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_NEW, Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_NEW, Config->s_MemoServ.c_str()); } else if (param.equals_ci("MAIL")) { if (!u->Account()->email.empty()) { u->Account()->SetFlag(NI_MEMO_MAIL); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_MAIL); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_MAIL); } else - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_INVALIDMAIL); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_INVALIDMAIL); } else if (param.equals_ci("NOMAIL")) { u->Account()->UnsetFlag(NI_MEMO_MAIL); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_NOMAIL); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_NOMAIL); } else if (param.equals_ci("OFF")) { u->Account()->UnsetFlag(NI_MEMO_SIGNON); u->Account()->UnsetFlag(NI_MEMO_RECEIVE); u->Account()->UnsetFlag(NI_MEMO_MAIL); - notice_lang(Config->s_MemoServ, u, MEMO_SET_NOTIFY_OFF, Config->s_MemoServ.c_str()); + u->SendMessage(MemoServ, MEMO_SET_NOTIFY_OFF, Config->s_MemoServ.c_str()); } else - syntax_error(Config->s_MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX); + SyntaxError(MemoServ, u, "SET NOTIFY", MEMO_SET_NOTIFY_SYNTAX); return MOD_CONT; } @@ -84,12 +84,12 @@ class CommandMSSet : public Command p3 = params.size() > 4 ? params[4] : ""; if (!(ci = cs_findchan(chan))) { - notice_lang(Config->s_MemoServ, u, CHAN_X_NOT_REGISTERED, chan.c_str()); + u->SendMessage(MemoServ, CHAN_X_NOT_REGISTERED, chan.c_str()); return MOD_CONT; } else if (!is_servadmin && !check_access(u, ci, CA_MEMO)) { - notice_lang(Config->s_MemoServ, u, ACCESS_DENIED); + u->SendMessage(MemoServ, ACCESS_DENIED); return MOD_CONT; } mi = &ci->memos; @@ -101,7 +101,7 @@ class CommandMSSet : public Command NickAlias *na; if (!(na = findnick(p1))) { - notice_lang(Config->s_MemoServ, u, NICK_X_NOT_REGISTERED, p1.c_str()); + u->SendMessage(MemoServ, NICK_X_NOT_REGISTERED, p1.c_str()); return MOD_CONT; } user = p1; @@ -112,12 +112,12 @@ class CommandMSSet : public Command } else if (p1.empty()) { - syntax_error(Config->s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); + SyntaxError(MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); return MOD_CONT; } if ((!isdigit(p1[0]) && !p1.equals_ci("NONE")) || (!p2.empty() && !p2.equals_ci("HARD"))) { - syntax_error(Config->s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); + SyntaxError(MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SERVADMIN_SYNTAX); return MOD_CONT; } if (!chan.empty()) @@ -137,7 +137,7 @@ class CommandMSSet : public Command limit = p1.is_number_only() ? convertTo<int32>(p1) : -1; if (limit < 0 || limit > 32767) { - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); + u->SendMessage(MemoServ, MEMO_SET_LIMIT_OVERFLOW, 32767); limit = 32767; } if (p1.equals_ci("NONE")) @@ -147,17 +147,17 @@ class CommandMSSet : public Command { if (p1.empty() || !p2.empty() || !isdigit(p1[0])) { - syntax_error(Config->s_MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SYNTAX); + SyntaxError(MemoServ, u, "SET LIMIT", MEMO_SET_LIMIT_SYNTAX); return MOD_CONT; } if (!chan.empty() && ci->HasFlag(CI_MEMO_HARDMAX)) { - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT_FORBIDDEN, chan.c_str()); + u->SendMessage(MemoServ, MEMO_SET_LIMIT_FORBIDDEN, chan.c_str()); return MOD_CONT; } else if (chan.empty() && nc->HasFlag(NI_MEMO_HARDMAX)) { - notice_lang(Config->s_MemoServ, u, MEMO_SET_YOUR_LIMIT_FORBIDDEN); + u->SendMessage(MemoServ, MEMO_SET_YOUR_LIMIT_FORBIDDEN); return MOD_CONT; } limit = p1.is_number_only() ? convertTo<int32>(p1) : -1; @@ -166,14 +166,14 @@ class CommandMSSet : public Command if (limit < 0 || (Config->MSMaxMemos > 0 && limit > Config->MSMaxMemos)) { if (!chan.empty()) - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT_TOO_HIGH, chan.c_str(), Config->MSMaxMemos); + u->SendMessage(MemoServ, MEMO_SET_LIMIT_TOO_HIGH, chan.c_str(), Config->MSMaxMemos); else - notice_lang(Config->s_MemoServ, u, MEMO_SET_YOUR_LIMIT_TOO_HIGH, Config->MSMaxMemos); + u->SendMessage(MemoServ, MEMO_SET_YOUR_LIMIT_TOO_HIGH, Config->MSMaxMemos); return MOD_CONT; } else if (limit > 32767) { - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT_OVERFLOW, 32767); + u->SendMessage(MemoServ, MEMO_SET_LIMIT_OVERFLOW, 32767); limit = 32767; } } @@ -181,23 +181,23 @@ class CommandMSSet : public Command if (limit > 0) { if (chan.empty() && nc == u->Account()) - notice_lang(Config->s_MemoServ, u, MEMO_SET_YOUR_LIMIT, limit); + u->SendMessage(MemoServ, MEMO_SET_YOUR_LIMIT, limit); else - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str(), limit); + u->SendMessage(MemoServ, MEMO_SET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str(), limit); } else if (!limit) { if (chan.empty() && nc == u->Account()) - notice_lang(Config->s_MemoServ, u, MEMO_SET_YOUR_LIMIT_ZERO); + u->SendMessage(MemoServ, MEMO_SET_YOUR_LIMIT_ZERO); else - notice_lang(Config->s_MemoServ, u, MEMO_SET_LIMIT_ZERO, !chan.empty() ? chan.c_str() : user.c_str()); + u->SendMessage(MemoServ, MEMO_SET_LIMIT_ZERO, !chan.empty() ? chan.c_str() : user.c_str()); } else { if (chan.empty() && nc == u->Account()) - notice_lang(Config->s_MemoServ, u, MEMO_UNSET_YOUR_LIMIT); + u->SendMessage(MemoServ, MEMO_UNSET_YOUR_LIMIT); else - notice_lang(Config->s_MemoServ, u, MEMO_UNSET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str()); + u->SendMessage(MemoServ, MEMO_UNSET_LIMIT, !chan.empty() ? chan.c_str() : user.c_str()); } return MOD_CONT; } @@ -213,7 +213,7 @@ class CommandMSSet : public Command if (readonly) { - notice_lang(Config->s_MemoServ, u, MEMO_SET_DISABLED); + u->SendMessage(MemoServ, MEMO_SET_DISABLED); return MOD_CONT; } else if (cmd.equals_ci("NOTIFY")) @@ -222,8 +222,8 @@ class CommandMSSet : public Command return this->DoLimit(u, params, mi); else { - notice_lang(Config->s_MemoServ, u, MEMO_SET_UNKNOWN_OPTION, cmd.c_str()); - notice_lang(Config->s_MemoServ, u, MORE_INFO, Config->s_MemoServ.c_str(), "SET"); + u->SendMessage(MemoServ, NICK_SET_UNKNOWN_OPTION, cmd.c_str()); + u->SendMessage(MemoServ, MORE_INFO, Config->s_MemoServ.c_str(), "SET"); } return MOD_CONT; } @@ -231,15 +231,15 @@ class CommandMSSet : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (subcommand.empty()) - notice_help(Config->s_MemoServ, u, MEMO_HELP_SET); + u->SendMessage(MemoServ, MEMO_HELP_SET); else if (subcommand.equals_ci("NOTIFY")) - notice_help(Config->s_MemoServ, u, MEMO_HELP_SET_NOTIFY); + u->SendMessage(MemoServ, MEMO_HELP_SET_NOTIFY); else if (subcommand.equals_ci("LIMIT")) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_MemoServ, u, MEMO_SERVADMIN_HELP_SET_LIMIT, Config->MSMaxMemos); + u->SendMessage(MemoServ, MEMO_SERVADMIN_HELP_SET_LIMIT, Config->MSMaxMemos); else - notice_help(Config->s_MemoServ, u, MEMO_HELP_SET_LIMIT, Config->MSMaxMemos); + u->SendMessage(MemoServ, MEMO_HELP_SET_LIMIT, Config->MSMaxMemos); } else return false; @@ -249,12 +249,12 @@ class CommandMSSet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "SET", MEMO_SET_SYNTAX); + SyntaxError(MemoServ, u, "SET", NICK_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_SET); + u->SendMessage(MemoServ, MEMO_HELP_CMD_SET); } }; diff --git a/modules/core/ms_staff.cpp b/modules/core/ms_staff.cpp index 292161a7b..7acebfe2e 100644 --- a/modules/core/ms_staff.cpp +++ b/modules/core/ms_staff.cpp @@ -26,7 +26,7 @@ class CommandMSStaff : public Command if (readonly) { - notice_lang(Config->s_MemoServ, u, MEMO_SEND_DISABLED); + u->SendMessage(MemoServ, MEMO_SEND_DISABLED); return MOD_CONT; } @@ -43,18 +43,18 @@ class CommandMSStaff : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_MemoServ, u, MEMO_HELP_STAFF); + u->SendMessage(MemoServ, MEMO_HELP_STAFF); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_MemoServ, u, "STAFF", MEMO_STAFF_SYNTAX); + SyntaxError(MemoServ, u, "STAFF", MEMO_STAFF_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_MemoServ, u, MEMO_HELP_CMD_STAFF); + u->SendMessage(MemoServ, MEMO_HELP_CMD_STAFF); } }; diff --git a/modules/core/ns_access.cpp b/modules/core/ns_access.cpp index bd2d34a32..946a1fa8f 100644 --- a/modules/core/ns_access.cpp +++ b/modules/core/ns_access.cpp @@ -23,17 +23,17 @@ class CommandNSAccess : public Command if (nc->access.empty()) { - notice_lang(Config->s_NickServ, u, NICK_ACCESS_LIST_X_EMPTY, nc->display.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_LIST_X_EMPTY, nc->display.c_str()); return MOD_CONT; } if (nc->HasFlag(NI_SUSPENDED)) { - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, nc->display.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, nc->display.c_str()); return MOD_CONT; } - notice_lang(Config->s_NickServ, u, NICK_ACCESS_LIST_X, params[1].c_str()); + u->SendMessage(NickServ, NICK_ACCESS_LIST_X, params[1].c_str()); for (i = 0, end = nc->access.size(); i < end; ++i) { Anope::string access = nc->GetAccess(i); @@ -55,18 +55,18 @@ class CommandNSAccess : public Command if (nc->access.size() >= Config->NSAccessMax) { - notice_lang(Config->s_NickServ, u, NICK_ACCESS_REACHED_LIMIT, Config->NSAccessMax); + u->SendMessage(NickServ, NICK_ACCESS_REACHED_LIMIT, Config->NSAccessMax); return MOD_CONT; } if (nc->FindAccess(mask)) { - notice_lang(Config->s_NickServ, u, NICK_ACCESS_ALREADY_PRESENT, mask.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_ALREADY_PRESENT, mask.c_str()); return MOD_CONT; } nc->AddAccess(mask); - notice_lang(Config->s_NickServ, u, NICK_ACCESS_ADDED, mask.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_ADDED, mask.c_str()); return MOD_CONT; } @@ -81,11 +81,11 @@ class CommandNSAccess : public Command if (!nc->FindAccess(mask)) { - notice_lang(Config->s_NickServ, u, NICK_ACCESS_NOT_FOUND, mask.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_NOT_FOUND, mask.c_str()); return MOD_CONT; } - notice_lang(Config->s_NickServ, u, NICK_ACCESS_DELETED, mask.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_DELETED, mask.c_str()); nc->EraseAccess(mask); return MOD_CONT; @@ -97,11 +97,11 @@ class CommandNSAccess : public Command if (nc->access.empty()) { - notice_lang(Config->s_NickServ, u, NICK_ACCESS_LIST_EMPTY, u->nick.c_str()); + u->SendMessage(NickServ, NICK_ACCESS_LIST_EMPTY, u->nick.c_str()); return MOD_CONT; } - notice_lang(Config->s_NickServ, u, NICK_ACCESS_LIST); + u->SendMessage(NickServ, NICK_ACCESS_LIST); for (i = 0, end = nc->access.size(); i < end; ++i) { Anope::string access = nc->GetAccess(i); @@ -128,15 +128,15 @@ class CommandNSAccess : public Command if (!mask.empty() && mask.find('@') == Anope::string::npos) { - notice_lang(Config->s_NickServ, u, BAD_USERHOST_MASK); - notice_lang(Config->s_NickServ, u, MORE_INFO, Config->s_NickServ.c_str(), "ACCESS"); + u->SendMessage(NickServ, BAD_USERHOST_MASK); + u->SendMessage(NickServ, MORE_INFO, Config->s_NickServ.c_str(), "ACCESS"); } /* else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick); */ else if (u->Account()->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, u->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, u->Account()->display.c_str()); else if (cmd.equals_ci("ADD")) return this->DoAdd(u, u->Account(), mask); else if (cmd.equals_ci("DEL")) @@ -150,18 +150,18 @@ class CommandNSAccess : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_ACCESS); + u->SendMessage(NickServ, NICK_HELP_ACCESS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX); + SyntaxError(NickServ, u, "ACCESS", NICK_ACCESS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_ACCESS); + u->SendMessage(NickServ, NICK_HELP_CMD_ACCESS); } }; diff --git a/modules/core/ns_alist.cpp b/modules/core/ns_alist.cpp index fe022a7fa..16a30726d 100644 --- a/modules/core/ns_alist.cpp +++ b/modules/core/ns_alist.cpp @@ -77,18 +77,18 @@ class CommandNSAList : public Command } if (!na) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (min_level <= ACCESS_INVALID || min_level > ACCESS_FOUNDER) - notice_lang(Config->s_NickServ, u, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); + u->SendMessage(NickServ, CHAN_ACCESS_LEVEL_RANGE, ACCESS_INVALID + 1, ACCESS_FOUNDER - 1); else { int level; int chan_count = 0; int match_count = 0; - notice_lang(Config->s_NickServ, u, is_servadmin ? NICK_ALIST_HEADER_X : NICK_ALIST_HEADER, na->nick.c_str()); + u->SendMessage(NickServ, is_servadmin ? NICK_ALIST_HEADER_X : NICK_ALIST_HEADER, na->nick.c_str()); for (registered_channel_map::const_iterator it = RegisteredChannelList.begin(), it_end = RegisteredChannelList.end(); it != it_end; ++it) { @@ -107,14 +107,14 @@ class CommandNSAList : public Command { Anope::string xop = get_xop_level(level); - notice_lang(Config->s_NickServ, u, NICK_ALIST_XOP_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), xop.c_str(), !ci->desc.empty() ? ci->desc.c_str() : ""); + u->SendMessage(NickServ, NICK_ALIST_XOP_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), xop.c_str(), !ci->desc.empty() ? ci->desc.c_str() : ""); } else - notice_lang(Config->s_NickServ, u, NICK_ALIST_ACCESS_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), level, !ci->desc.empty() ? ci->desc.c_str() : ""); + u->SendMessage(NickServ, NICK_ALIST_ACCESS_FORMAT, match_count, ci->HasFlag(CI_NO_EXPIRE) ? '!' : ' ', ci->name.c_str(), level, !ci->desc.empty() ? ci->desc.c_str() : ""); } } - notice_lang(Config->s_NickServ, u, NICK_ALIST_FOOTER, match_count, chan_count); + u->SendMessage(NickServ, NICK_ALIST_FOOTER, match_count, chan_count); } return MOD_CONT; } @@ -122,16 +122,16 @@ class CommandNSAList : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_ALIST); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_ALIST); else - notice_help(Config->s_NickServ, u, NICK_HELP_ALIST); + u->SendMessage(NickServ, NICK_HELP_ALIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_ALIST); + u->SendMessage(NickServ, NICK_HELP_CMD_ALIST); } }; diff --git a/modules/core/ns_drop.cpp b/modules/core/ns_drop.cpp index 4180bf0e6..13f003ff2 100644 --- a/modules/core/ns_drop.cpp +++ b/modules/core/ns_drop.cpp @@ -30,7 +30,7 @@ class CommandNSDrop : public Command if (readonly) { - notice_lang(Config->s_NickServ, u, NICK_DROP_DISABLED); + u->SendMessage(NickServ, NICK_DROP_DISABLED); return MOD_CONT; } @@ -44,13 +44,13 @@ class CommandNSDrop : public Command ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str()); Log(LOG_ADMIN, u, this) << "to drop nickname " << nr->nick << " (email: " << nr->email << ")"; delete nr; - notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_DROPPED, nick.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_NOT_REGISTERED); + u->SendMessage(NickServ, NICK_NOT_REGISTERED); return MOD_CONT; } @@ -59,13 +59,13 @@ class CommandNSDrop : public Command my_nick = na->nick; if (!is_mine && !u->Account()->HasPriv("nickserv/drop")) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); else if (Config->NSSecureAdmins && !is_mine && na->nc->IsServicesOper()) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); else { if (readonly) - notice_lang(Config->s_NickServ, u, READ_ONLY_MODE); + u->SendMessage(NickServ, READ_ONLY_MODE); if (ircd->sqline && na->HasFlag(NS_FORBIDDEN)) { @@ -82,14 +82,14 @@ class CommandNSDrop : public Command { if (Config->WallDrop) ircdproto->SendGlobops(NickServ, "\2%s\2 used DROP on \2%s\2", u->nick.c_str(), nick.c_str()); - notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_DROPPED, nick.c_str()); } else { if (!nick.empty()) - notice_lang(Config->s_NickServ, u, NICK_X_DROPPED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_DROPPED, nick.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_DROPPED); + u->SendMessage(NickServ, NICK_DROPPED); } } @@ -99,16 +99,16 @@ class CommandNSDrop : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->HasPriv("nickserv/drop")) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_DROP); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_DROP); else - notice_help(Config->s_NickServ, u, NICK_HELP_DROP); + u->SendMessage(NickServ, NICK_HELP_DROP); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_DROP); + u->SendMessage(NickServ, NICK_HELP_CMD_DROP); } }; diff --git a/modules/core/ns_forbid.cpp b/modules/core/ns_forbid.cpp index e7c3162a2..c54392289 100644 --- a/modules/core/ns_forbid.cpp +++ b/modules/core/ns_forbid.cpp @@ -34,17 +34,17 @@ class CommandNSForbid : public Command } if (readonly) - notice_lang(Config->s_NickServ, u, READ_ONLY_MODE); + u->SendMessage(NickServ, READ_ONLY_MODE); if (!ircdproto->IsNickValid(nick)) { - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, nick.c_str()); return MOD_CONT; } if ((na = findnick(nick))) { if (Config->NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_CONT; } delete na; @@ -63,7 +63,7 @@ class CommandNSForbid : public Command if (curr) { - notice_lang(Config->s_NickServ, curr, FORCENICKCHANGE_NOW); + curr->SendMessage(NickServ, FORCENICKCHANGE_NOW); curr->Collide(na); } @@ -77,7 +77,7 @@ class CommandNSForbid : public Command ircdproto->SendGlobops(NickServ, "\2%s\2 used FORBID on \2%s\2", u->nick.c_str(), nick.c_str()); Log(LOG_ADMIN, u, this) << "to forbid nick " << nick; - notice_lang(Config->s_NickServ, u, NICK_FORBID_SUCCEEDED, nick.c_str()); + u->SendMessage(NickServ, NICK_FORBID_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickForbidden, OnNickForbidden(na)); } @@ -85,25 +85,25 @@ class CommandNSForbid : public Command { // XXX cant happen ? //Alog() << Config->s_NickServ << ": Valid FORBID for " << nick << " by " << u->nick << " failed"; - notice_lang(Config->s_NickServ, u, NICK_FORBID_FAILED, nick.c_str()); + u->SendMessage(NickServ, NICK_FORBID_FAILED, nick.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_FORBID); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_FORBID); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "FORBID", Config->ForceForbidReason ? NICK_FORBID_SYNTAX_REASON : NICK_FORBID_SYNTAX); + SyntaxError(NickServ, u, "FORBID", Config->ForceForbidReason ? NICK_FORBID_SYNTAX_REASON : NICK_FORBID_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_FORBID); + u->SendMessage(NickServ, NICK_HELP_CMD_FORBID); } }; diff --git a/modules/core/ns_getemail.cpp b/modules/core/ns_getemail.cpp index 1d8afcad1..14626ea97 100644 --- a/modules/core/ns_getemail.cpp +++ b/modules/core/ns_getemail.cpp @@ -38,13 +38,13 @@ class CommandNSGetEMail : public Command if (!nc->email.empty() && nc->email.equals_ci(email)) { ++j; - notice_lang(Config->s_NickServ, u, NICK_GETEMAIL_EMAILS_ARE, nc->display.c_str(), email.c_str()); + u->SendMessage(NickServ, NICK_GETEMAIL_EMAILS_ARE, nc->display.c_str(), email.c_str()); } } if (j <= 0) { - notice_lang(Config->s_NickServ, u, NICK_GETEMAIL_NOT_USED, email.c_str()); + u->SendMessage(NickServ, NICK_GETEMAIL_NOT_USED, email.c_str()); return MOD_CONT; } @@ -53,18 +53,18 @@ class CommandNSGetEMail : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_GETEMAIL); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_GETEMAIL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX); + SyntaxError(NickServ, u, "GETMAIL", NICK_GETEMAIL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_GETEMAIL); + u->SendMessage(NickServ, NICK_HELP_CMD_GETEMAIL); } }; diff --git a/modules/core/ns_getpass.cpp b/modules/core/ns_getpass.cpp index a2d288cbc..4bfd9fe91 100644 --- a/modules/core/ns_getpass.cpp +++ b/modules/core/ns_getpass.cpp @@ -34,15 +34,15 @@ class CommandNSGetPass : public Command Log(LOG_ADMIN, u, this) << "for " << nr->nick; if (Config->WallGetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str()); - notice_lang(Config->s_NickServ, u, NICK_GETPASS_PASSCODE_IS, nick.c_str(), nr->passcode.c_str()); + u->SendMessage(NickServ, NICK_GETPASS_PASSCODE_IS, nick.c_str(), nr->passcode.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); } else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (Config->NSSecureAdmins && na->nc->IsServicesOper()) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); else { if (enc_decrypt(na->nc->pass, tmp_pass) == 1) @@ -50,28 +50,28 @@ class CommandNSGetPass : public Command Log(LOG_ADMIN, u, this) << "for " << nick; if (Config->WallGetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used GETPASS on \2%s\2", u->nick.c_str(), nick.c_str()); - notice_lang(Config->s_NickServ, u, NICK_GETPASS_PASSWORD_IS, nick.c_str(), tmp_pass.c_str()); + u->SendMessage(NickServ, NICK_GETPASS_PASSWORD_IS, nick.c_str(), tmp_pass.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_GETPASS_UNAVAILABLE); + u->SendMessage(NickServ, NICK_GETPASS_UNAVAILABLE); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_GETPASS); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_GETPASS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX); + SyntaxError(NickServ, u, "GETPASS", NICK_GETPASS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_GETPASS); + u->SendMessage(NickServ, NICK_HELP_CMD_GETPASS); } }; diff --git a/modules/core/ns_ghost.cpp b/modules/core/ns_ghost.cpp index a4f1b5f8f..8a46fb2b6 100644 --- a/modules/core/ns_ghost.cpp +++ b/modules/core/ns_ghost.cpp @@ -28,15 +28,15 @@ class CommandNSGhost : public Command NickAlias *na = findnick(nick); if (!finduser(nick)) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_IN_USE, nick.c_str()); else if (!na) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, na->nick.c_str()); else if (nick.equals_ci(u->nick)) - notice_lang(Config->s_NickServ, u, NICK_NO_GHOST_SELF); + u->SendMessage(NickServ, NICK_NO_GHOST_SELF); else if (!pass.empty()) { int res = enc_check_password(pass, na->nc->pass); @@ -45,11 +45,11 @@ class CommandNSGhost : public Command Log(LOG_COMMAND, u, this) << "for " << nick; Anope::string buf = "GHOST command used by " + u->nick; kill_user(Config->s_NickServ, nick, buf); - notice_lang(Config->s_NickServ, u, NICK_GHOST_KILLED, nick.c_str()); + u->SendMessage(NickServ, NICK_GHOST_KILLED, nick.c_str()); } else { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); if (!res) { Log(LOG_COMMAND, u, this) << "invalid password for " << nick; @@ -65,28 +65,28 @@ class CommandNSGhost : public Command Log(LOG_COMMAND, u, this) << "for " << nick; Anope::string buf = "GHOST command used by " + u->nick; kill_user(Config->s_NickServ, nick, buf); - notice_lang(Config->s_NickServ, u, NICK_GHOST_KILLED, nick.c_str()); + u->SendMessage(NickServ, NICK_GHOST_KILLED, nick.c_str()); } else - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_GHOST); + u->SendMessage(NickServ, NICK_HELP_GHOST); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "GHOST", NICK_GHOST_SYNTAX); + SyntaxError(NickServ, u, "GHOST", NICK_GHOST_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_GHOST); + u->SendMessage(NickServ, NICK_HELP_CMD_GHOST); } }; diff --git a/modules/core/ns_group.cpp b/modules/core/ns_group.cpp index 7c0802e37..615f388f0 100644 --- a/modules/core/ns_group.cpp +++ b/modules/core/ns_group.cpp @@ -30,19 +30,19 @@ class CommandNSGroup : public Command if (Config->NSEmailReg && findrequestnick(u->nick)) { - notice_lang(Config->s_NickServ, u, NICK_REQUESTED); + u->SendMessage(NickServ, NICK_REQUESTED); return MOD_CONT; } if (readonly) { - notice_lang(Config->s_NickServ, u, NICK_GROUP_DISABLED); + u->SendMessage(NickServ, NICK_GROUP_DISABLED); return MOD_CONT; } if (!ircdproto->IsNickValid(u->nick)) { - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, u->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, u->nick.c_str()); return MOD_CONT; } @@ -50,40 +50,40 @@ class CommandNSGroup : public Command for (it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it) if (!is_oper(u) && u->nick.find_ci(it->first) != Anope::string::npos) { - notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); return MOD_CONT; } na = findnick(u->nick); if (!(target = findnick(nick))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay) - notice_lang(Config->s_NickServ, u, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime); + u->SendMessage(NickServ, NICK_GROUP_PLEASE_WAIT, (Config->NSRegDelay + u->lastnickreg) - Anope::CurTime); else if (u->Account() && u->Account()->HasFlag(NI_SUSPENDED)) { //Alog() << Config->s_NickServ << ": " << u->GetMask() << " tried to use GROUP from SUSPENDED nick " << target->nick; - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, u->nick.c_str()); } else if (target && target->nc->HasFlag(NI_SUSPENDED)) { Log(LOG_COMMAND, u, this) << "tried to use GROUP for SUSPENDED nick " << target->nick; - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, target->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, target->nick.c_str()); } else if (target->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, nick.c_str()); else if (na && target->nc == na->nc) - notice_lang(Config->s_NickServ, u, NICK_GROUP_SAME, target->nick.c_str()); + u->SendMessage(NickServ, NICK_GROUP_SAME, target->nick.c_str()); else if (na && na->nc != u->Account()) - notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_IDENTIFY_REQUIRED, Config->s_NickServ.c_str()); else if (Config->NSMaxAliases && (target->nc->aliases.size() >= Config->NSMaxAliases) && !target->nc->IsServicesOper()) - notice_lang(Config->s_NickServ, u, NICK_GROUP_TOO_MANY, target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_GROUP_TOO_MANY, target->nick.c_str(), Config->s_NickServ.c_str(), Config->s_NickServ.c_str()); else { int res = enc_check_password(pass, target->nc->pass); if (res == -1) { Log(LOG_COMMAND, u, this) << "failed group for " << na->nick << " (invalid password)"; - notice_lang(Config->s_NickServ, u, PASSWORD_INCORRECT); + u->SendMessage(NickServ, PASSWORD_INCORRECT); if (bad_password(u)) return MOD_STOP; } @@ -101,7 +101,7 @@ class CommandNSGroup : public Command if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && !u->nick.substr(prefixlen).find_first_not_of("1234567890")) { - notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); return MOD_CONT; } } @@ -121,7 +121,7 @@ class CommandNSGroup : public Command u->SetMode(NickServ, UMODE_REGISTERED); Log(LOG_COMMAND, u, this) << "makes " << u->nick << " join group of " << target->nick << " (" << target->nc->display << ") (email: " << (!target->nc->email.empty() ? target->nc->email : "none") << ")"; - notice_lang(Config->s_NickServ, u, NICK_GROUP_JOINED, target->nick.c_str()); + u->SendMessage(NickServ, NICK_GROUP_JOINED, target->nick.c_str()); u->lastnickreg = Anope::CurTime; @@ -131,7 +131,7 @@ class CommandNSGroup : public Command { // XXX not possible? //Alog() << Config->s_NickServ << ": makealias(" << u->nick << ") failed"; - notice_lang(Config->s_NickServ, u, NICK_GROUP_FAILED); + u->SendMessage(NickServ, NICK_GROUP_FAILED); } } } @@ -140,18 +140,18 @@ class CommandNSGroup : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_GROUP); + u->SendMessage(NickServ, NICK_HELP_GROUP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "GROUP", NICK_GROUP_SYNTAX); + SyntaxError(NickServ, u, "GROUP", NICK_GROUP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_GROUP); + u->SendMessage(NickServ, NICK_HELP_CMD_GROUP); } }; @@ -168,11 +168,11 @@ class CommandNSUngroup : public Command NickAlias *na = findnick(!nick.empty() ? nick : u->nick); if (u->Account()->aliases.size() == 1) - notice_lang(Config->s_NickServ, u, NICK_UNGROUP_ONE_NICK); + u->SendMessage(NickServ, NICK_UNGROUP_ONE_NICK); else if (!na) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, !nick.empty() ? nick.c_str() : u->nick.c_str()); else if (na->nc != u->Account()) - notice_lang(Config->s_NickServ, u, NICK_UNGROUP_NOT_IN_GROUP, na->nick.c_str()); + u->SendMessage(NickServ, NICK_UNGROUP_NOT_IN_GROUP, na->nick.c_str()); else { NickCore *oldcore = na->nc; @@ -194,7 +194,7 @@ class CommandNSUngroup : public Command na->nc->greet = oldcore->greet; na->nc->language = oldcore->language; - notice_lang(Config->s_NickServ, u, NICK_UNGROUP_SUCCESSFUL, na->nick.c_str(), oldcore->display.c_str()); + u->SendMessage(NickServ, NICK_UNGROUP_SUCCESSFUL, na->nick.c_str(), oldcore->display.c_str()); User *user = finduser(na->nick); if (user) @@ -207,13 +207,13 @@ class CommandNSUngroup : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_UNGROUP); + u->SendMessage(NickServ, NICK_HELP_UNGROUP); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_UNGROUP); + u->SendMessage(NickServ, NICK_HELP_CMD_UNGROUP); } }; @@ -231,30 +231,19 @@ class CommandNSGList : public Command const NickCore *nc = u->Account(); if (!nick.empty() && (!nick.equals_ci(u->nick) && !u->Account()->IsServicesOper())) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED, Config->s_NickServ.c_str()); + u->SendMessage(NickServ, ACCESS_DENIED, Config->s_NickServ.c_str()); else if (!nick.empty() && (!findnick(nick) || !(nc = findnick(nick)->nc))) - notice_lang(Config->s_NickServ, u, nick.empty() ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, nick.empty() ? NICK_NOT_REGISTERED : NICK_X_NOT_REGISTERED, nick.c_str()); else { - time_t expt; - struct tm *tm; - char buf[BUFSIZE]; - int wont_expire; - - notice_lang(Config->s_NickServ, u, !nick.empty() ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display.c_str()); + u->SendMessage(NickServ, !nick.empty() ? NICK_GLIST_HEADER_X : NICK_GLIST_HEADER, nc->display.c_str()); for (std::list<NickAlias *>::const_iterator it = nc->aliases.begin(), it_end = nc->aliases.end(); it != it_end; ++it) { NickAlias *na2 = *it; - if (!(wont_expire = na2->HasFlag(NS_NO_EXPIRE))) - { - expt = na2->last_seen + Config->NSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), finduser(na2->nick), STRFTIME_DATE_TIME_FORMAT, tm); - } - notice_lang(Config->s_NickServ, u, wont_expire ? NICK_GLIST_REPLY_NOEXPIRE : NICK_GLIST_REPLY, na2->nick.c_str(), buf); + u->SendMessage(NickServ, na2->HasFlag(NS_NO_EXPIRE) ? NICK_GLIST_REPLY_NOEXPIRE : NICK_GLIST_REPLY, na2->nick.c_str(), do_strftime(na2->last_seen + Config->NSExpire).c_str()); } - notice_lang(Config->s_NickServ, u, NICK_GLIST_FOOTER, nc->aliases.size()); + u->SendMessage(NickServ, NICK_GLIST_FOOTER, nc->aliases.size()); } return MOD_CONT; } @@ -262,16 +251,16 @@ class CommandNSGList : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_GLIST); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_GLIST); else - notice_help(Config->s_NickServ, u, NICK_HELP_GLIST); + u->SendMessage(NickServ, NICK_HELP_GLIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_GLIST); + u->SendMessage(NickServ, NICK_HELP_CMD_GLIST); } }; diff --git a/modules/core/ns_help.cpp b/modules/core/ns_help.cpp index 7dad067b9..8bd062f6a 100644 --- a/modules/core/ns_help.cpp +++ b/modules/core/ns_help.cpp @@ -23,32 +23,21 @@ class CommandNSHelp : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { - Anope::string cmd = params[0]; - - if (cmd.equals_ci("SET LANGUAGE")) - { - int i; - notice_help(Config->s_NickServ, u, NICK_HELP_SET_LANGUAGE); - for (i = 0; i < NUM_LANGS && langlist[i] >= 0; ++i) - u->SendMessage(Config->s_NickServ, " %2d) %s", i + 1, langnames[langlist[i]]); - } - else - mod_help_cmd(NickServ, u, cmd); - + mod_help_cmd(NickServ, u, params[0]); return MOD_CONT; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP); + u->SendMessage(NickServ, NICK_HELP); for (CommandMap::const_iterator it = NickServ->Commands.begin(), it_end = NickServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP); if (Config->NSExpire >= 86400) - notice_help(Config->s_NickServ, u, NICK_HELP_EXPIRES, Config->NSExpire / 86400); - notice_help(Config->s_NickServ, u, NICK_HELP_FOOTER); + u->SendMessage(NickServ, NICK_HELP_EXPIRES, Config->NSExpire / 86400); + u->SendMessage(NickServ, NICK_HELP_FOOTER); } }; diff --git a/modules/core/ns_identify.cpp b/modules/core/ns_identify.cpp index 943847355..ddeca2417 100644 --- a/modules/core/ns_identify.cpp +++ b/modules/core/ns_identify.cpp @@ -31,32 +31,32 @@ class CommandNSIdentify : public Command { NickRequest *nr = findrequestnick(nick); if (nr) - notice_lang(Config->s_NickServ, u, NICK_IS_PREREG); + u->SendMessage(NickServ, NICK_IS_PREREG); else - notice_lang(Config->s_NickServ, u, NICK_NOT_REGISTERED); + u->SendMessage(NickServ, NICK_NOT_REGISTERED); } else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, na->nick.c_str()); /* You can now identify for other nicks without logging out first, * however you can not identify again for the group you're already * identified as */ else if (u->Account() && u->Account() == na->nc) - notice_lang(Config->s_NickServ, u, NICK_ALREADY_IDENTIFIED); + u->SendMessage(NickServ, NICK_ALREADY_IDENTIFIED); else { int res = enc_check_password(pass, na->nc->pass); if (!res) { Log(LOG_COMMAND, u, this) << "and failed to identify"; - notice_lang(Config->s_NickServ, u, PASSWORD_INCORRECT); + u->SendMessage(NickServ, PASSWORD_INCORRECT); if (bad_password(u)) return MOD_STOP; } else if (res == -1) - notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_FAILED); + u->SendMessage(NickServ, NICK_IDENTIFY_FAILED); else { if (u->IsIdentified()) @@ -77,7 +77,7 @@ class CommandNSIdentify : public Command FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u)); Log(LOG_COMMAND, u, this) << "and identified for account " << u->Account()->display; - notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_SUCCEEDED); + u->SendMessage(NickServ, NICK_IDENTIFY_SUCCEEDED); if (ircd->vhost) do_on_id(u); if (Config->NSModeOnID) @@ -85,8 +85,8 @@ class CommandNSIdentify : public Command if (Config->NSForceEmail && u->Account() && u->Account()->email.empty()) { - notice_lang(Config->s_NickServ, u, NICK_IDENTIFY_EMAIL_REQUIRED); - notice_help(Config->s_NickServ, u, NICK_IDENTIFY_EMAIL_HOWTO); + u->SendMessage(NickServ, NICK_IDENTIFY_EMAIL_REQUIRED); + u->SendMessage(NickServ, NICK_IDENTIFY_EMAIL_HOWTO); } if (u->IsIdentified()) @@ -98,19 +98,19 @@ class CommandNSIdentify : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_IDENTIFY); + u->SendMessage(NickServ, NICK_HELP_IDENTIFY); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX); + SyntaxError(NickServ, u, "IDENTIFY", NICK_IDENTIFY_SYNTAX); } void OnServHelp(User *u) { if (this->name.equals_ci("IDENTIFY")) - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_IDENTIFY); + u->SendMessage(NickServ, NICK_HELP_CMD_IDENTIFY); } }; diff --git a/modules/core/ns_info.cpp b/modules/core/ns_info.cpp index c6c1aa2a4..6f77874a5 100644 --- a/modules/core/ns_info.cpp +++ b/modules/core/ns_info.cpp @@ -21,9 +21,8 @@ class CommandNSInfo : public Command { if (reverse_logic ? !nc->HasFlag(opt) : nc->HasFlag(opt)) { - const char *commastr = getstring(nc, COMMA_SPACE); if (!buf.empty()) - buf += commastr; + buf += ", "; buf += str; } @@ -46,28 +45,25 @@ class CommandNSInfo : public Command NickRequest *nr = findrequestnick(nick); if (nr) { - notice_lang(Config->s_NickServ, u, NICK_IS_PREREG); + u->SendMessage(NickServ, NICK_IS_PREREG); if (has_auspex) - notice_lang(Config->s_NickServ, u, NICK_INFO_EMAIL, nr->email.c_str()); + u->SendMessage(NickServ, NICK_INFO_EMAIL, nr->email.c_str()); } else if (nickIsServices(nick, true)) - notice_lang(Config->s_NickServ, u, NICK_X_IS_SERVICES, nick.c_str()); + u->SendMessage(NickServ, NICK_X_IS_SERVICES, nick.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); } else if (na->HasFlag(NS_FORBIDDEN)) { if (is_oper(u) && !na->last_usermask.empty()) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : getstring(u, NO_REASON)); + u->SendMessage(NickServ, NICK_X_FORBIDDEN_OPER, nick.c_str(), na->last_usermask.c_str(), !na->last_realname.empty() ? na->last_realname.c_str() : GetString(u, NO_REASON).c_str()); else - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, nick.c_str()); } else { - struct tm *tm; - char buf[BUFSIZE]; bool nick_online = false, show_hidden = false; - time_t expt; /* Is the real owner of the nick we're looking up online? -TheShadow */ User *u2 = finduser(na->nick); @@ -77,80 +73,71 @@ class CommandNSInfo : public Command if (has_auspex || (u->Account() && na->nc == u->Account())) show_hidden = true; - notice_lang(Config->s_NickServ, u, NICK_INFO_REALNAME, na->nick.c_str(), na->last_realname.c_str()); + u->SendMessage(NickServ, NICK_INFO_REALNAME, na->nick.c_str(), na->last_realname.c_str()); if (na->nc->IsServicesOper() && (show_hidden || !na->nc->HasFlag(NI_HIDE_STATUS))) - notice_lang(Config->s_NickServ, u, NICK_INFO_SERVICES_OPERTYPE, na->nick.c_str(), na->nc->ot->GetName().c_str()); + u->SendMessage(NickServ, NICK_INFO_SERVICES_OPERTYPE, na->nick.c_str(), na->nc->ot->GetName().c_str()); if (nick_online) { if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK)) - notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS_ONLINE, na->last_usermask.c_str()); + u->SendMessage(NickServ, NICK_INFO_ADDRESS_ONLINE, na->last_usermask.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick.c_str()); + u->SendMessage(NickServ, NICK_INFO_ADDRESS_ONLINE_NOHOST, na->nick.c_str()); } else { if (show_hidden || !na->nc->HasFlag(NI_HIDE_MASK)) - notice_lang(Config->s_NickServ, u, NICK_INFO_ADDRESS, na->last_usermask.c_str()); + u->SendMessage(NickServ, NICK_INFO_ADDRESS, na->last_usermask.c_str()); } - tm = localtime(&na->time_registered); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_NickServ, u, NICK_INFO_TIME_REGGED, buf); + u->SendMessage(NickServ, NICK_INFO_TIME_REGGED, do_strftime(na->time_registered).c_str()); if (!nick_online) { - tm = localtime(&na->last_seen); - strftime_lang(buf, sizeof(buf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_NickServ, u, NICK_INFO_LAST_SEEN, buf); + u->SendMessage(NickServ, NICK_INFO_LAST_SEEN, do_strftime(na->last_seen).c_str()); } if (!na->last_quit.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_QUIT))) - notice_lang(Config->s_NickServ, u, NICK_INFO_LAST_QUIT, na->last_quit.c_str()); + u->SendMessage(NickServ, NICK_INFO_LAST_QUIT, na->last_quit.c_str()); if (!na->nc->email.empty() && (show_hidden || !na->nc->HasFlag(NI_HIDE_EMAIL))) - notice_lang(Config->s_NickServ, u, NICK_INFO_EMAIL, na->nc->email.c_str()); + u->SendMessage(NickServ, NICK_INFO_EMAIL, na->nc->email.c_str()); if (show_hidden) { if (!Config->s_HostServ.empty() && ircd->vhost && na->hostinfo.HasVhost()) { if (ircd->vident && !na->hostinfo.GetIdent().empty()) - notice_lang(Config->s_NickServ, u, NICK_INFO_VHOST2, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); + u->SendMessage(NickServ, NICK_INFO_VHOST2, na->hostinfo.GetIdent().c_str(), na->hostinfo.GetHost().c_str()); else - notice_lang(Config->s_NickServ, u, NICK_INFO_VHOST, na->hostinfo.GetHost().c_str()); + u->SendMessage(NickServ, NICK_INFO_VHOST, na->hostinfo.GetHost().c_str()); } if (!na->nc->greet.empty()) - notice_lang(Config->s_NickServ, u, NICK_INFO_GREET, na->nc->greet.c_str()); + u->SendMessage(NickServ, NICK_INFO_GREET, na->nc->greet.c_str()); Anope::string optbuf; - CheckOptStr(optbuf, NI_KILLPROTECT, getstring(u, NICK_INFO_OPT_KILL), na->nc); - CheckOptStr(optbuf, NI_SECURE, getstring(u, NICK_INFO_OPT_SECURE), na->nc); - CheckOptStr(optbuf, NI_PRIVATE, getstring(u, NICK_INFO_OPT_PRIVATE), na->nc); - CheckOptStr(optbuf, NI_MSG, getstring(u, NICK_INFO_OPT_MSG), na->nc); - CheckOptStr(optbuf, NI_AUTOOP, getstring(u, NICK_INFO_OPT_AUTOOP), na->nc); + CheckOptStr(optbuf, NI_KILLPROTECT, GetString(u, NICK_INFO_OPT_KILL).c_str(), na->nc); + CheckOptStr(optbuf, NI_SECURE, GetString(u, NICK_INFO_OPT_SECURE).c_str(), na->nc); + CheckOptStr(optbuf, NI_PRIVATE, GetString(u, NICK_INFO_OPT_PRIVATE).c_str(), na->nc); + CheckOptStr(optbuf, NI_MSG, GetString(u, NICK_INFO_OPT_MSG).c_str(), na->nc); + CheckOptStr(optbuf, NI_AUTOOP, GetString(u, NICK_INFO_OPT_AUTOOP).c_str(), na->nc); - notice_lang(Config->s_NickServ, u, NICK_INFO_OPTIONS, optbuf.empty() ? getstring(u, NICK_INFO_OPT_NONE) : optbuf.c_str()); + u->SendMessage(NickServ, NICK_INFO_OPTIONS, optbuf.empty() ? GetString(u, NICK_INFO_OPT_NONE).c_str() : optbuf.c_str()); if (na->nc->HasFlag(NI_SUSPENDED)) { if (!na->last_quit.empty()) - notice_lang(Config->s_NickServ, u, NICK_INFO_SUSPENDED, na->last_quit.c_str()); + u->SendMessage(NickServ, NICK_INFO_SUSPENDED, na->last_quit.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_INFO_SUSPENDED_NO_REASON); + u->SendMessage(NickServ, NICK_INFO_SUSPENDED_NO_REASON); } if (na->HasFlag(NS_NO_EXPIRE)) - notice_lang(Config->s_NickServ, u, NICK_INFO_NO_EXPIRE); + u->SendMessage(NickServ, NICK_INFO_NO_EXPIRE); else - { - expt = na->last_seen + Config->NSExpire; - tm = localtime(&expt); - strftime_lang(buf, sizeof(buf), finduser(na->nick), STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_NickServ, u, NICK_INFO_EXPIRE, buf); - } + u->SendMessage(NickServ, NICK_INFO_EXPIRE, do_strftime(na->last_seen + Config->NSExpire).c_str()); } FOREACH_MOD(I_OnNickInfo, OnNickInfo(u, na, show_hidden)); @@ -160,19 +147,19 @@ class CommandNSInfo : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_INFO); + u->SendMessage(NickServ, NICK_HELP_INFO); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "INFO", NICK_INFO_SYNTAX); + SyntaxError(NickServ, u, "INFO", NICK_INFO_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_INFO); + u->SendMessage(NickServ, NICK_HELP_CMD_INFO); } }; diff --git a/modules/core/ns_list.cpp b/modules/core/ns_list.cpp index 3ba44c77e..347d21b9a 100644 --- a/modules/core/ns_list.cpp +++ b/modules/core/ns_list.cpp @@ -49,7 +49,7 @@ class CommandNSList : public Command if (Config->NSListOpersOnly && !is_oper(u)) /* reverse the help logic */ { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_STOP; } @@ -58,24 +58,24 @@ class CommandNSList : public Command Anope::string tmp = myStrGetToken(pattern.substr(1), '-', 0); /* Read FROM out */ if (tmp.empty()) { - notice_lang(Config->s_NickServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(NickServ, LIST_INCORRECT_RANGE); return MOD_CONT; } if (!tmp.is_number_only()) { - notice_lang(Config->s_NickServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(NickServ, LIST_INCORRECT_RANGE); return MOD_CONT; } from = convertTo<int>(tmp); tmp = myStrGetTokenRemainder(pattern, '-', 1); /* Read TO out */ if (tmp.empty()) { - notice_lang(Config->s_NickServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(NickServ, LIST_INCORRECT_RANGE); return MOD_CONT; } if (!tmp.is_number_only()) { - notice_lang(Config->s_NickServ, u, LIST_INCORRECT_RANGE); + u->SendMessage(NickServ, LIST_INCORRECT_RANGE); return MOD_CONT; } to = convertTo<int>(tmp); @@ -103,7 +103,7 @@ class CommandNSList : public Command mync = u->Account(); - notice_lang(Config->s_NickServ, u, NICK_LIST_HEADER, pattern.c_str()); + u->SendMessage(NickServ, NICK_LIST_HEADER, pattern.c_str()); if (!unconfirmed) { for (nickalias_map::const_iterator it = NickAliasList.begin(), it_end = NickAliasList.end(); it != it_end; ++it) @@ -165,16 +165,16 @@ class CommandNSList : public Command } } } - notice_lang(Config->s_NickServ, u, NICK_LIST_RESULTS, nnicks > Config->NSListMax ? Config->NSListMax : nnicks, nnicks); + u->SendMessage(NickServ, NICK_LIST_RESULTS, nnicks > Config->NSListMax ? Config->NSListMax : nnicks, nnicks); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_LIST); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_LIST); else - notice_help(Config->s_NickServ, u, NICK_HELP_LIST); + u->SendMessage(NickServ, NICK_HELP_LIST); return true; } @@ -182,14 +182,14 @@ class CommandNSList : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { if (u->Account()->IsServicesOper()) - syntax_error(Config->s_NickServ, u, "LIST", NICK_LIST_SERVADMIN_SYNTAX); + SyntaxError(NickServ, u, "LIST", NICK_LIST_SERVADMIN_SYNTAX); else - syntax_error(Config->s_NickServ, u, "LIST", NICK_LIST_SYNTAX); + SyntaxError(NickServ, u, "LIST", NICK_LIST_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_LIST); + u->SendMessage(NickServ, NICK_HELP_CMD_LIST); } }; diff --git a/modules/core/ns_logout.cpp b/modules/core/ns_logout.cpp index 7d09f9111..252fe1d0d 100644 --- a/modules/core/ns_logout.cpp +++ b/modules/core/ns_logout.cpp @@ -29,9 +29,9 @@ class CommandNSLogout : public Command if (!u->Account()->IsServicesOper() && !nick.empty()) this->OnSyntaxError(u, ""); else if (!(u2 = (!nick.empty() ? finduser(nick) : u))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_IN_USE, nick.c_str()); else if (!nick.empty() && u2->Account() && !u2->Account()->IsServicesOper()) - notice_lang(Config->s_NickServ, u, NICK_LOGOUT_SERVICESADMIN, nick.c_str()); + u->SendMessage(NickServ, NICK_LOGOUT_SERVICESADMIN, nick.c_str()); else { if (!nick.empty() && !param.empty() && param.equals_ci("REVALIDATE")) @@ -42,9 +42,9 @@ class CommandNSLogout : public Command /* Remove founder status from this user in all channels */ if (!nick.empty()) - notice_lang(Config->s_NickServ, u, NICK_LOGOUT_X_SUCCEEDED, nick.c_str()); + u->SendMessage(NickServ, NICK_LOGOUT_X_SUCCEEDED, nick.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_LOGOUT_SUCCEEDED); + u->SendMessage(NickServ, NICK_LOGOUT_SUCCEEDED); ircdproto->SendAccountLogout(u2, u2->Account()); u2->RemoveMode(NickServ, UMODE_REGISTERED); @@ -61,21 +61,21 @@ class CommandNSLogout : public Command bool OnHelp(User *u, const Anope::string &subcommand) { if (u->Account() && u->Account()->IsServicesOper()) - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_LOGOUT); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_LOGOUT); else - notice_help(Config->s_NickServ, u, NICK_HELP_LOGOUT); + u->SendMessage(NickServ, NICK_HELP_LOGOUT); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX); + SyntaxError(NickServ, u, "LOGOUT", NICK_LOGOUT_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_LOGOUT); + u->SendMessage(NickServ, NICK_HELP_CMD_LOGOUT); } }; diff --git a/modules/core/ns_recover.cpp b/modules/core/ns_recover.cpp index 868a7f69e..73d65f966 100644 --- a/modules/core/ns_recover.cpp +++ b/modules/core/ns_recover.cpp @@ -29,32 +29,32 @@ class CommandNSRecover : public Command User *u2; if (!(u2 = finduser(nick))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_IN_USE, nick.c_str()); else if (!(na = findnick(u2->nick))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, na->nick.c_str()); else if (nick.equals_ci(u->nick)) - notice_lang(Config->s_NickServ, u, NICK_NO_RECOVER_SELF); + u->SendMessage(NickServ, NICK_NO_RECOVER_SELF); else if (!pass.empty()) { int res = enc_check_password(pass, na->nc->pass); if (res == 1) { - notice_lang(Config->s_NickServ, u2, FORCENICKCHANGE_NOW); + u2->SendMessage(NickServ, FORCENICKCHANGE_NOW); u2->Collide(na); /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout); - notice_lang(Config->s_NickServ, u, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str()); + u->SendMessage(NickServ, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str()); } else { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); if (!res) { Log(LOG_COMMAND, u, this) << "with invalid password for " << nick; @@ -67,16 +67,16 @@ class CommandNSRecover : public Command { if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc))) { - notice_lang(Config->s_NickServ, u2, FORCENICKCHANGE_NOW); + u2->SendMessage(NickServ, FORCENICKCHANGE_NOW); u2->Collide(na); /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(na->nc, Config->NSReleaseTimeout); - notice_lang(Config->s_NickServ, u, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str()); + u->SendMessage(NickServ, NICK_RECOVERED, Config->s_NickServ.c_str(), nick.c_str(), relstr.c_str()); } else - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); } return MOD_CONT; } @@ -86,19 +86,19 @@ class CommandNSRecover : public Command /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(u->Account(), Config->NSReleaseTimeout); - notice_help(Config->s_NickServ, u, NICK_HELP_RECOVER, relstr.c_str()); + u->SendMessage(NickServ, NICK_HELP_RECOVER, relstr.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX); + SyntaxError(NickServ, u, "RECOVER", NICK_RECOVER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RECOVER); + u->SendMessage(NickServ, NICK_HELP_CMD_RECOVER); } }; diff --git a/modules/core/ns_register.cpp b/modules/core/ns_register.cpp index b95b0c68a..a2af5ad7e 100644 --- a/modules/core/ns_register.cpp +++ b/modules/core/ns_register.cpp @@ -26,7 +26,7 @@ class CommandNSConfirm : public Command { // XXX //Alog() << Config->s_NickServ << ": makenick(" << u->nick << ") failed"; - notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_FAILED); + u->SendMessage(NickServ, NICK_REGISTRATION_FAILED); return MOD_CONT; } @@ -60,23 +60,23 @@ class CommandNSConfirm : public Command u->Login(na->nc); Log(LOG_COMMAND, u, this) << "to register " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")"; if (Config->NSAddAccessOnReg) - notice_lang(Config->s_NickServ, u, NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str()); + u->SendMessage(NickServ, NICK_REGISTERED, u->nick.c_str(), na->nc->GetAccess(0).c_str()); else - notice_lang(Config->s_NickServ, u, NICK_REGISTERED_NO_MASK, u->nick.c_str()); + u->SendMessage(NickServ, NICK_REGISTERED_NO_MASK, u->nick.c_str()); delete nr; ircdproto->SendAccountLogin(u, u->Account()); ircdproto->SetAutoIdentificationToken(u); if (enc_decrypt(na->nc->pass, tmp_pass) == 1) - notice_lang(Config->s_NickServ, u, NICK_PASSWORD_IS, tmp_pass.c_str()); + u->SendMessage(NickServ, NICK_PASSWORD_IS, tmp_pass.c_str()); u->lastnickreg = Anope::CurTime; } else { Log(LOG_COMMAND, u, this) << "to confirm " << u->nick << " (email: " << (!nr->email.empty() ? nr->email : "none") << ")"; - notice_lang(Config->s_NickServ, u, NICK_FORCE_REG, nr->nick.c_str()); + u->SendMessage(NickServ, NICK_FORCE_REG, nr->nick.c_str()); User *user = finduser(nr->nick); /* Delrequest must be called before validate_user */ delete nr; @@ -116,21 +116,21 @@ class CommandNSConfirm : public Command return MOD_CONT; } } - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_CONFIRM_NOT_FOUND, Config->s_NickServ.c_str()); return MOD_CONT; } if (!nr->passcode.equals_cs(passcode)) { - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID); + u->SendMessage(NickServ, NICK_CONFIRM_INVALID); return MOD_CONT; } } if (!nr) { - notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_FAILED); + u->SendMessage(NickServ, NICK_REGISTRATION_FAILED); return MOD_CONT; } @@ -151,20 +151,20 @@ class CommandNSConfirm : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_CONFIRM); + u->SendMessage(NickServ, NICK_HELP_CONFIRM); if (u->Account() && u->Account()->HasPriv("nickserv/confirm")) - notice_help(Config->s_NickServ, u, NICK_HELP_CONFIRM_OPER); + u->SendMessage(NickServ, NICK_HELP_CONFIRM_OPER); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID); + u->SendMessage(NickServ, NICK_CONFIRM_INVALID); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_CONFIRM); + u->SendMessage(NickServ, NICK_HELP_CMD_CONFIRM); } }; @@ -197,19 +197,19 @@ class CommandNSRegister : public CommandNSConfirm if (readonly) { - notice_lang(Config->s_NickServ, u, NICK_REGISTRATION_DISABLED); + u->SendMessage(NickServ, NICK_REGISTRATION_DISABLED); return MOD_CONT; } if (!is_oper(u) && Config->NickRegDelay && Anope::CurTime - u->my_signon < Config->NickRegDelay) { - notice_lang(Config->s_NickServ, u, NICK_REG_DELAY, Config->NickRegDelay); + u->SendMessage(NickServ, NICK_REG_DELAY, Config->NickRegDelay); return MOD_CONT; } if ((anr = findrequestnick(u->nick))) { - notice_lang(Config->s_NickServ, u, NICK_REQUESTED); + u->SendMessage(NickServ, NICK_REQUESTED); return MOD_CONT; } @@ -220,13 +220,13 @@ class CommandNSRegister : public CommandNSConfirm */ if (nicklen <= prefixlen + 7 && nicklen >= prefixlen + 1 && !u->nick.find_ci(Config->NSGuestNickPrefix) && !u->nick.substr(prefixlen).find_first_not_of("1234567890")) { - notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); return MOD_CONT; } if (!ircdproto->IsNickValid(u->nick)) { - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, u->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, u->nick.c_str()); return MOD_CONT; } @@ -237,7 +237,7 @@ class CommandNSRegister : public CommandNSConfirm if (u->nick.find_ci(nick) != Anope::string::npos && !is_oper(u)) { - notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); return MOD_CONT; } } @@ -245,7 +245,7 @@ class CommandNSRegister : public CommandNSConfirm if (Config->NSForceEmail && email.empty()) this->OnSyntaxError(u, ""); else if (Anope::CurTime < u->lastnickreg + Config->NSRegDelay) - notice_lang(Config->s_NickServ, u, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime); + u->SendMessage(NickServ, NICK_REG_PLEASE_WAIT, (u->lastnickreg + Config->NSRegDelay) - Anope::CurTime); else if ((na = findnick(u->nick))) { /* i.e. there's already such a nick regged */ @@ -253,17 +253,17 @@ class CommandNSRegister : public CommandNSConfirm { // XXX //Alog() << Config->s_NickServ << ": " << u->GetIdent() << "@" << u->host << " tried to register FORBIDden nick " << u->nick; - notice_lang(Config->s_NickServ, u, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_CANNOT_BE_REGISTERED, u->nick.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_ALREADY_REGISTERED, u->nick.c_str()); + u->SendMessage(NickServ, NICK_ALREADY_REGISTERED, u->nick.c_str()); } else if (pass.equals_ci(u->nick) || (Config->StrictPasswords && pass.length() < 5)) - notice_lang(Config->s_NickServ, u, MORE_OBSCURE_PASSWORD); + u->SendMessage(NickServ, MORE_OBSCURE_PASSWORD); else if (pass.length() > Config->PassLen) - notice_lang(Config->s_NickServ, u, PASSWORD_TOO_LONG); + u->SendMessage(NickServ, PASSWORD_TOO_LONG); else if (!email.empty() && !MailValidate(email)) - notice_lang(Config->s_NickServ, u, MAIL_X_INVALID, email.c_str()); + u->SendMessage(NickServ, MAIL_X_INVALID, email.c_str()); else { for (idx = 0; idx < 9; ++idx) @@ -279,13 +279,13 @@ class CommandNSRegister : public CommandNSConfirm { if (SendRegmail(u, nr)) { - notice_lang(Config->s_NickServ, u, NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_ENTER_REG_CODE, email.c_str(), Config->s_NickServ.c_str()); Log(LOG_COMMAND, u, this) << "send registration verification code to " << nr->email; } else { Log(LOG_COMMAND, u, this) << "unable to send registration verification mail"; - notice_lang(Config->s_NickServ, u, NICK_REG_UNABLE); + u->SendMessage(NickServ, NICK_REG_UNABLE); delete nr; return MOD_CONT; } @@ -302,21 +302,21 @@ class CommandNSRegister : public CommandNSConfirm bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_REGISTER); + u->SendMessage(NickServ, NICK_HELP_REGISTER); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { if (Config->NSForceEmail) - syntax_error(Config->s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL); + SyntaxError(NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX_EMAIL); else - syntax_error(Config->s_NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX); + SyntaxError(NickServ, u, "REGISTER", NICK_REGISTER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_REGISTER); + u->SendMessage(NickServ, NICK_HELP_CMD_REGISTER); } }; @@ -337,13 +337,13 @@ class CommandNSResend : public Command { if (Anope::CurTime < nr->lastmail + Config->NSResendDelay) { - notice_lang(Config->s_NickServ, u, MAIL_LATER); + u->SendMessage(NickServ, MAIL_LATER); return MOD_CONT; } if (!SendRegmail(u, nr)) { nr->lastmail = Anope::CurTime; - notice_lang(Config->s_NickServ, u, NICK_REG_RESENT, nr->email.c_str()); + u->SendMessage(NickServ, NICK_REG_RESENT, nr->email.c_str()); Log(LOG_COMMAND, u, this) << "resend registration verification code for " << nr->nick; } else @@ -358,13 +358,13 @@ class CommandNSResend : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_RESEND); + u->SendMessage(NickServ, NICK_HELP_RESEND); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RESEND); + u->SendMessage(NickServ, NICK_HELP_CMD_RESEND); } }; @@ -390,10 +390,10 @@ static bool SendRegmail(User *u, NickRequest *nr) { char subject[BUFSIZE], message[BUFSIZE]; - snprintf(subject, sizeof(subject), getstring(NICK_REG_MAIL_SUBJECT), nr->nick.c_str()); - snprintf(message, sizeof(message), getstring(NICK_REG_MAIL), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str()); + snprintf(subject, sizeof(subject), GetString(NICK_REG_MAIL_SUBJECT).c_str(), nr->nick.c_str()); + snprintf(message, sizeof(message), GetString(NICK_REG_MAIL).c_str(), nr->nick.c_str(), Config->NetworkName.c_str(), Config->s_NickServ.c_str(), nr->passcode.c_str(), Config->NetworkName.c_str()); - return Mail(u, nr, Config->s_NickServ, subject, message); + return Mail(u, nr, NickServ, subject, message); } MODULE_INIT(NSRegister) diff --git a/modules/core/ns_release.cpp b/modules/core/ns_release.cpp index 1fe340758..b8b517e36 100644 --- a/modules/core/ns_release.cpp +++ b/modules/core/ns_release.cpp @@ -28,24 +28,24 @@ class CommandNSRelease : public Command NickAlias *na; if (!(na = findnick(nick))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, na->nick.c_str()); else if (!na->HasFlag(NS_HELD)) - notice_lang(Config->s_NickServ, u, NICK_RELEASE_NOT_HELD, nick.c_str()); + u->SendMessage(NickServ, NICK_RELEASE_NOT_HELD, nick.c_str()); else if (!pass.empty()) { int res = enc_check_password(pass, na->nc->pass); if (res == 1) { Log(LOG_COMMAND, u, this) << "released " << na->nick; - notice_lang(Config->s_NickServ, u, NICK_RELEASED); + u->SendMessage(NickServ, NICK_RELEASED); } else { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); if (!res) { Log(LOG_COMMAND, u, this) << "invalid password for " << nick; @@ -59,10 +59,10 @@ class CommandNSRelease : public Command if (u->Account() == na->nc || (!na->nc->HasFlag(NI_SECURE) && is_on_access(u, na->nc))) { na->Release(); - notice_lang(Config->s_NickServ, u, NICK_RELEASED); + u->SendMessage(NickServ, NICK_RELEASED); } else - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); } return MOD_CONT; } @@ -72,20 +72,19 @@ class CommandNSRelease : public Command /* Convert Config->NSReleaseTimeout seconds to string format */ Anope::string relstr = duration(u->Account(), Config->NSReleaseTimeout); - notice_help(Config->s_NickServ, u, NICK_HELP_RELEASE, relstr.c_str()); - //do_help_limited(Config->s_NickServ, u, this); + u->SendMessage(NickServ, NICK_HELP_RELEASE, relstr.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX); + SyntaxError(NickServ, u, "RELEASE", NICK_RELEASE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RELEASE); + u->SendMessage(NickServ, NICK_HELP_CMD_RELEASE); } }; diff --git a/modules/core/ns_resetpass.cpp b/modules/core/ns_resetpass.cpp index 63c58d5ed..1c23c5010 100644 --- a/modules/core/ns_resetpass.cpp +++ b/modules/core/ns_resetpass.cpp @@ -28,17 +28,17 @@ class CommandNSResetPass : public Command NickAlias *na; if (Config->RestrictMail && (!u->Account() || !u->Account()->HasCommand("nickserv/resetpass"))) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); if (!(na = findnick(params[0]))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, params[0].c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, params[0].c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else { if (SendResetEmail(u, na)) { Log(LOG_COMMAND, u, this) << "for " << na->nick << " (group: " << na->nc->display << ")"; - notice_lang(Config->s_NickServ, u, NICK_RESETPASS_COMPLETE, na->nick.c_str()); + u->SendMessage(NickServ, NICK_RESETPASS_COMPLETE, na->nick.c_str()); } } @@ -47,18 +47,18 @@ class CommandNSResetPass : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_RESETPASS); + u->SendMessage(NickServ, NICK_HELP_RESETPASS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "RESETPASS", NICK_RESETPASS_SYNTAX); + SyntaxError(NickServ, u, "RESETPASS", NICK_RESETPASS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_RESETPASS); + u->SendMessage(NickServ, NICK_HELP_CMD_RESETPASS); } }; @@ -94,7 +94,7 @@ class NSResetPass : public Module { na->nc->Shrink("ns_resetpass_code"); na->nc->Shrink("ns_resetpass_time"); - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_EXPIRED); + u->SendMessage(NickServ, NICK_CONFIRM_EXPIRED); return EVENT_STOP; } @@ -114,7 +114,7 @@ class NSResetPass : public Module FOREACH_MOD(I_OnNickIdentify, OnNickIdentify(u)); Log(LOG_COMMAND, u, &commandnsresetpass) << "confirmed RESETPASS to forcefully identify to " << na->nick; - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_SUCCESS, Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_CONFIRM_SUCCESS, Config->s_NickServ.c_str()); if (ircd->vhost) do_on_id(u); @@ -125,7 +125,7 @@ class NSResetPass : public Module else { Log(LOG_COMMAND, u, &commandnsresetpass) << "invalid confirm passcode for " << na->nick; - notice_lang(Config->s_NickServ, u, NICK_CONFIRM_INVALID); + u->SendMessage(NickServ, NICK_CONFIRM_INVALID); bad_password(u); } @@ -141,7 +141,7 @@ static bool SendResetEmail(User *u, NickAlias *na) { char subject[BUFSIZE], message[BUFSIZE]; - snprintf(subject, sizeof(subject), getstring(na, NICK_RESETPASS_SUBJECT), na->nick.c_str()); + snprintf(subject, sizeof(subject), GetString(na->nc, NICK_RESETPASS_SUBJECT).c_str(), na->nick.c_str()); int min = 1, max = 62; int chars[] = { @@ -157,7 +157,7 @@ static bool SendResetEmail(User *u, NickAlias *na) for (idx = 0; idx < 20; ++idx) passcode += chars[1 + static_cast<int>((static_cast<float>(max - min)) * getrandom16() / 65536.0) + min]; - snprintf(message, sizeof(message), getstring(na, NICK_RESETPASS_MESSAGE), na->nick.c_str(), Config->s_NickServ.c_str(), passcode.c_str(), Config->NetworkName.c_str()); + snprintf(message, sizeof(message), GetString(na->nc, NICK_RESETPASS_MESSAGE).c_str(), na->nick.c_str(), Config->s_NickServ.c_str(), passcode.c_str(), Config->NetworkName.c_str()); na->nc->Shrink("ns_resetpass_code"); na->nc->Shrink("ns_resetpass_time"); @@ -165,7 +165,7 @@ static bool SendResetEmail(User *u, NickAlias *na) na->nc->Extend("ns_resetpass_code", new ExtensibleItemRegular<Anope::string>(passcode)); na->nc->Extend("ns_resetpass_time", new ExtensibleItemRegular<time_t>(Anope::CurTime)); - return Mail(u, na->nc, Config->s_NickServ, subject, message); + return Mail(u, na->nc, NickServ, subject, message); } MODULE_INIT(NSResetPass) diff --git a/modules/core/ns_saset.cpp b/modules/core/ns_saset.cpp index c6494d292..229f48e8c 100644 --- a/modules/core/ns_saset.cpp +++ b/modules/core/ns_saset.cpp @@ -35,17 +35,17 @@ class CommandNSSASet : public Command if (readonly) { - notice_lang(Config->s_NickServ, u, NICK_SASET_DISABLED); + u->SendMessage(NickServ, NICK_SET_DISABLED); return MOD_CONT; } NickAlias *na = findnick(nick); if (!na) - notice_lang(Config->s_NickServ, u, NICK_SASET_BAD_NICK, nick.c_str()); + u->SendMessage(NickServ, NICK_SASET_BAD_NICK, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else if (na->nc->HasFlag(NI_SUSPENDED)) - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, na->nick.c_str()); else { Command *c = this->FindCommand(params[1]); @@ -59,7 +59,7 @@ class CommandNSSASet : public Command mod_run_cmd(NickServ, u, c, params[1], cmdparams); } else - notice_lang(Config->s_NickServ, u, NICK_SASET_UNKNOWN_OPTION, cmd.c_str()); + u->SendMessage(NickServ, NICK_SASET_UNKNOWN_OPTION, cmd.c_str()); } return MOD_CONT; @@ -69,10 +69,10 @@ class CommandNSSASet : public Command { if (subcommand.empty()) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_HEAD); + u->SendMessage(NickServ, NICK_HELP_SASET_HEAD); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(u); - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_TAIL); + u->SendMessage(NickServ, NICK_HELP_SASET_TAIL); return true; } else @@ -88,12 +88,12 @@ class CommandNSSASet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "SASET", NICK_SASET_SYNTAX); + SyntaxError(NickServ, u, "SASET", NICK_SASET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET); } bool AddSubcommand(Command *c) @@ -133,30 +133,30 @@ class CommandNSSASetDisplay : public Command NickAlias *na = findnick(params[1]); if (!na || na->nc != nc) { - notice_lang(Config->s_NickServ, u, NICK_SASET_DISPLAY_INVALID, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_DISPLAY_INVALID, nc->display.c_str()); return MOD_CONT; } change_core_display(nc, params[1]); - notice_lang(Config->s_NickServ, u, NICK_SASET_DISPLAY_CHANGED, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SET_DISPLAY_CHANGED, nc->display.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_DISPLAY); + u->SendMessage(NickServ, NICK_HELP_SASET_DISPLAY); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_NickServ, u, "SASET", NICK_SASET_SYNTAX); + SyntaxError(NickServ, u, "SASET", NICK_SASET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_DISPLAY); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_DISPLAY); } }; @@ -177,17 +177,17 @@ class CommandNSSASetPassword : public Command if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper()) { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_CONT; } else if (nc->display.equals_ci(params[1]) || (Config->StrictPasswords && len < 5)) { - notice_lang(Config->s_NickServ, u, MORE_OBSCURE_PASSWORD); + u->SendMessage(NickServ, MORE_OBSCURE_PASSWORD); return MOD_CONT; } else if (len > Config->PassLen) { - notice_lang(Config->s_NickServ, u, PASSWORD_TOO_LONG); + u->SendMessage(NickServ, PASSWORD_TOO_LONG); return MOD_CONT; } @@ -195,15 +195,15 @@ class CommandNSSASetPassword : public Command { // XXX //Alog() << Config->s_NickServ << ": Failed to encrypt password for " << nc->display << " (saset)"; - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_FAILED, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_FAILED, nc->display.c_str()); return MOD_CONT; } Anope::string tmp_pass; if (enc_decrypt(nc->pass, tmp_pass) == 1) - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, nc->display.c_str(), tmp_pass.c_str()); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_CHANGED_TO, nc->display.c_str(), tmp_pass.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_CHANGED, nc->display.c_str()); if (Config->WallSetpass) ircdproto->SendGlobops(NickServ, "\2%s\2 used SASET PASSWORD on \2%s\2", u->nick.c_str(), nc->display.c_str()); @@ -213,18 +213,18 @@ class CommandNSSASetPassword : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_PASSWORD); + u->SendMessage(NickServ, NICK_HELP_SASET_PASSWORD); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET", NICK_SASET_SYNTAX); + SyntaxError(NickServ, u, "SASET", NICK_SASET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_PASSWORD); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_PASSWORD); } }; diff --git a/modules/core/ns_saset_noexpire.cpp b/modules/core/ns_saset_noexpire.cpp index 6d1c3816b..3489dcd2e 100644 --- a/modules/core/ns_saset_noexpire.cpp +++ b/modules/core/ns_saset_noexpire.cpp @@ -31,12 +31,12 @@ class CommandNSSASetNoexpire : public Command if (param.equals_ci("ON")) { na->SetFlag(NS_NO_EXPIRE); - notice_lang(Config->s_NickServ, u, NICK_SASET_NOEXPIRE_ON, na->nick.c_str()); + u->SendMessage(NickServ, NICK_SASET_NOEXPIRE_ON, na->nick.c_str()); } else if (param.equals_ci("OFF")) { na->UnsetFlag(NS_NO_EXPIRE); - notice_lang(Config->s_NickServ, u, NICK_SASET_NOEXPIRE_OFF, na->nick.c_str()); + u->SendMessage(NickServ, NICK_SASET_NOEXPIRE_OFF, na->nick.c_str()); } else this->OnSyntaxError(u, "NOEXPIRE"); @@ -46,18 +46,18 @@ class CommandNSSASetNoexpire : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_NOEXPIRE); + u->SendMessage(NickServ, NICK_HELP_SASET_NOEXPIRE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); + SyntaxError(NickServ, u, "SASET NOEXPIRE", NICK_SASET_NOEXPIRE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_NOEXPIRE); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_NOEXPIRE); } }; diff --git a/modules/core/ns_sendpass.cpp b/modules/core/ns_sendpass.cpp index 6d0efb2a7..488196cf8 100644 --- a/modules/core/ns_sendpass.cpp +++ b/modules/core/ns_sendpass.cpp @@ -29,11 +29,11 @@ class CommandNSSendPass : public Command NickAlias *na; if (Config->RestrictMail && (!u->Account() || !u->Account()->HasCommand("nickserv/sendpass"))) - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); else if (!(na = findnick(nick))) - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); else if (na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); else { Anope::string tmp_pass; @@ -42,11 +42,11 @@ class CommandNSSendPass : public Command if (SendPassMail(u, na, tmp_pass)) { Log(Config->RestrictMail ? LOG_ADMIN : LOG_COMMAND, u, this) << "for " << na->nick; - notice_lang(Config->s_NickServ, u, NICK_SENDPASS_OK, nick.c_str()); + u->SendMessage(NickServ, NICK_SENDPASS_OK, nick.c_str()); } } else - notice_lang(Config->s_NickServ, u, NICK_SENDPASS_UNAVAILABLE); + u->SendMessage(NickServ, NICK_SENDPASS_UNAVAILABLE); } return MOD_CONT; @@ -54,18 +54,18 @@ class CommandNSSendPass : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_SENDPASS); + u->SendMessage(NickServ, NICK_HELP_SENDPASS); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX); + SyntaxError(NickServ, u, "SENDPASS", NICK_SENDPASS_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SENDPASS); + u->SendMessage(NickServ, NICK_HELP_CMD_SENDPASS); } }; @@ -94,10 +94,10 @@ static bool SendPassMail(User *u, NickAlias *na, const Anope::string &pass) { char subject[BUFSIZE], message[BUFSIZE]; - snprintf(subject, sizeof(subject), getstring(na, NICK_SENDPASS_SUBJECT), na->nick.c_str()); - snprintf(message, sizeof(message), getstring(na, NICK_SENDPASS), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str()); + snprintf(subject, sizeof(subject), GetString(na->nc, NICK_SENDPASS_SUBJECT).c_str(), na->nick.c_str()); + snprintf(message, sizeof(message), GetString(na->nc, NICK_SENDPASS).c_str(), na->nick.c_str(), pass.c_str(), Config->NetworkName.c_str()); - return Mail(u, na->nc, Config->s_NickServ, subject, message); + return Mail(u, na->nc, NickServ, subject, message); } MODULE_INIT(NSSendPass) diff --git a/modules/core/ns_set.cpp b/modules/core/ns_set.cpp index 2eb7c6a19..fd4486c93 100644 --- a/modules/core/ns_set.cpp +++ b/modules/core/ns_set.cpp @@ -32,13 +32,13 @@ class CommandNSSet : public Command { if (readonly) { - notice_lang(Config->s_NickServ, u, NICK_SET_DISABLED); + u->SendMessage(NickServ, NICK_SET_DISABLED); return MOD_CONT; } if (u->Account()->HasFlag(NI_SUSPENDED)) { - notice_lang(Config->s_NickServ, u, NICK_X_SUSPENDED, u->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_X_SUSPENDED, u->Account()->display.c_str()); return MOD_CONT; } @@ -52,7 +52,7 @@ class CommandNSSet : public Command mod_run_cmd(NickServ, u, c, params[0], cmdparams); } else - notice_lang(Config->s_NickServ, u, NICK_SET_UNKNOWN_OPTION, params[0].c_str()); + u->SendMessage(NickServ, NICK_SET_UNKNOWN_OPTION, params[0].c_str()); return MOD_CONT; } @@ -61,10 +61,10 @@ class CommandNSSet : public Command { if (subcommand.empty()) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_HEAD); + u->SendMessage(NickServ, NICK_HELP_SET_HEAD); for (subcommand_map::iterator it = this->subcommands.begin(), it_end = this->subcommands.end(); it != it_end; ++it) it->second->OnServHelp(u); - notice_help(Config->s_NickServ, u, NICK_HELP_SET_TAIL); + u->SendMessage(NickServ, NICK_HELP_SET_TAIL); return true; } else @@ -80,12 +80,12 @@ class CommandNSSet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "SET", NICK_SET_SYNTAX); + SyntaxError(NickServ, u, "SET", NICK_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET); + u->SendMessage(NickServ, NICK_HELP_CMD_SET); } bool AddSubcommand(Command *c) @@ -122,30 +122,30 @@ class CommandNSSetDisplay : public Command if (!na || na->nc != u->Account()) { - notice_lang(Config->s_NickServ, u, NICK_SASET_DISPLAY_INVALID, u->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_DISPLAY_INVALID, u->Account()->display.c_str()); return MOD_CONT; } change_core_display(u->Account(), params[0]); - notice_lang(Config->s_NickServ, u, NICK_SET_DISPLAY_CHANGED, u->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_SET_DISPLAY_CHANGED, u->Account()->display.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_DISPLAY); + u->SendMessage(NickServ, NICK_HELP_SET_DISPLAY); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_NickServ, u, "SET", NICK_SET_SYNTAX); + SyntaxError(NickServ, u, "SET", NICK_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_DISPLAY); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_DISPLAY); } }; @@ -164,12 +164,12 @@ class CommandNSSetPassword : public Command if (u->Account()->display.equals_ci(param) || (Config->StrictPasswords && len < 5)) { - notice_lang(Config->s_NickServ, u, MORE_OBSCURE_PASSWORD); + u->SendMessage(NickServ, MORE_OBSCURE_PASSWORD); return MOD_CONT; } else if (len > Config->PassLen) { - notice_lang(Config->s_NickServ, u, PASSWORD_TOO_LONG); + u->SendMessage(NickServ, PASSWORD_TOO_LONG); return MOD_CONT; } @@ -177,34 +177,34 @@ class CommandNSSetPassword : public Command { // XXX ? //Alog() << Config->s_NickServ << ": Failed to encrypt password for " << u->Account()->display << " (set)"; - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_FAILED); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_FAILED); return MOD_CONT; } Anope::string tmp_pass; if (enc_decrypt(u->Account()->pass, tmp_pass) == 1) - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED_TO, u->Account()->display.c_str(), tmp_pass.c_str()); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_CHANGED_TO, u->Account()->display.c_str(), tmp_pass.c_str()); else - notice_lang(Config->s_NickServ, u, NICK_SASET_PASSWORD_CHANGED, u->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_PASSWORD_CHANGED, u->Account()->display.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_PASSWORD); + u->SendMessage(NickServ, NICK_HELP_SET_PASSWORD); return true; } void OnSyntaxError(User *u, const Anope::string &) { // XXX - syntax_error(Config->s_NickServ, u, "SET", NICK_SET_SYNTAX); + SyntaxError(NickServ, u, "SET", NICK_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_PASSWORD); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_PASSWORD); } }; diff --git a/modules/core/ns_set_autoop.cpp b/modules/core/ns_set_autoop.cpp index fea68d742..4578362f5 100644 --- a/modules/core/ns_set_autoop.cpp +++ b/modules/core/ns_set_autoop.cpp @@ -31,12 +31,12 @@ class CommandNSSetAutoOp : public Command if (param.equals_ci("ON")) { nc->SetFlag(NI_AUTOOP); - notice_lang(Config->s_NickServ, u, NICK_SASET_AUTOOP_ON, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_AUTOOP_ON, nc->display.c_str()); } else if (param.equals_ci("OFF")) { nc->UnsetFlag(NI_AUTOOP); - notice_lang(Config->s_NickServ, u, NICK_SASET_AUTOOP_OFF, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_AUTOOP_OFF, nc->display.c_str()); } else this->OnSyntaxError(u, "AUTOOP"); @@ -46,18 +46,18 @@ class CommandNSSetAutoOp : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_AUTOOP); + u->SendMessage(NickServ, NICK_HELP_SET_AUTOOP); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX); + SyntaxError(NickServ, u, "SET AUTOOP", NICK_SET_AUTOOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_AUTOOP); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_AUTOOP); } }; @@ -70,18 +70,18 @@ class CommandNSSASetAutoOp : public CommandNSSetAutoOp bool Help(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_AUTOOP); + u->SendMessage(NickServ, NICK_HELP_SASET_AUTOOP); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX); + SyntaxError(NickServ, u, "SET AUTOOP", NICK_SASET_AUTOOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_AUTOOP); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_AUTOOP); } }; diff --git a/modules/core/ns_set_email.cpp b/modules/core/ns_set_email.cpp index 9820d9632..c257286c7 100644 --- a/modules/core/ns_set_email.cpp +++ b/modules/core/ns_set_email.cpp @@ -30,29 +30,29 @@ class CommandNSSetEmail : public Command if (param.empty() && Config->NSForceEmail) { - notice_lang(Config->s_NickServ, u, NICK_SASET_EMAIL_UNSET_IMPOSSIBLE); + u->SendMessage(NickServ, NICK_SET_EMAIL_UNSET_IMPOSSIBLE); return MOD_CONT; } else if (Config->NSSecureAdmins && u->Account() != nc && nc->IsServicesOper()) { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_CONT; } else if (!param.empty() && !MailValidate(param)) { - notice_lang(Config->s_NickServ, u, MAIL_X_INVALID, param.c_str()); + u->SendMessage(NickServ, MAIL_X_INVALID, param.c_str()); return MOD_CONT; } if (!param.empty()) { nc->email = param; - notice_lang(Config->s_NickServ, u, NICK_SASET_EMAIL_CHANGED, nc->display.c_str(), param.c_str()); + u->SendMessage(NickServ, NICK_SASET_EMAIL_CHANGED, nc->display.c_str(), param.c_str()); } else { nc->email.clear(); - notice_lang(Config->s_NickServ, u, NICK_SASET_EMAIL_UNSET, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_EMAIL_UNSET, nc->display.c_str()); } return MOD_CONT; @@ -60,13 +60,13 @@ class CommandNSSetEmail : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_EMAIL); + u->SendMessage(NickServ, NICK_HELP_SET_EMAIL); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_EMAIL); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_EMAIL); } }; @@ -79,13 +79,13 @@ class CommandNSSASetEmail : public CommandNSSetEmail bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_EMAIL); + u->SendMessage(NickServ, NICK_HELP_SASET_EMAIL); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_EMAIL); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_EMAIL); } }; diff --git a/modules/core/ns_set_greet.cpp b/modules/core/ns_set_greet.cpp index 0390b92f8..fca7d54e9 100644 --- a/modules/core/ns_set_greet.cpp +++ b/modules/core/ns_set_greet.cpp @@ -31,12 +31,12 @@ class CommandNSSetGreet : public Command if (!param.empty()) { nc->greet = param; - notice_lang(Config->s_NickServ, u, NICK_SASET_GREET_CHANGED, nc->display.c_str(), nc->greet.c_str()); + u->SendMessage(NickServ, NICK_SASET_GREET_CHANGED, nc->display.c_str(), nc->greet.c_str()); } else { nc->greet.clear(); - notice_lang(Config->s_NickServ, u, NICK_SASET_GREET_UNSET, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_GREET_UNSET, nc->display.c_str()); } return MOD_CONT; @@ -44,13 +44,13 @@ class CommandNSSetGreet : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_GREET); + u->SendMessage(NickServ, NICK_HELP_SET_GREET); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_GREET); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_GREET); } }; @@ -63,13 +63,13 @@ class CommandNSSASetGreet : public CommandNSSetGreet bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_GREET); + u->SendMessage(NickServ, NICK_HELP_SASET_GREET); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_GREET); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_GREET); } }; diff --git a/modules/core/ns_set_hide.cpp b/modules/core/ns_set_hide.cpp index b8487027d..f6fdfd853 100644 --- a/modules/core/ns_set_hide.cpp +++ b/modules/core/ns_set_hide.cpp @@ -26,7 +26,7 @@ class CommandNSSetHide : public Command if (!nc) throw CoreException("NULL nc in CommandNSSetHide"); - int onmsg, offmsg; + LanguageString onmsg, offmsg; NickCoreFlag flag; Anope::string param = params[1]; @@ -65,12 +65,12 @@ class CommandNSSetHide : public Command if (arg.equals_ci("ON")) { nc->SetFlag(flag); - notice_lang(Config->s_NickServ, u, onmsg, nc->display.c_str(), Config->s_NickServ.c_str()); + u->SendMessage(NickServ, onmsg, nc->display.c_str(), Config->s_NickServ.c_str()); } else if (arg.equals_ci("OFF")) { nc->UnsetFlag(flag); - notice_lang(Config->s_NickServ, u, offmsg, nc->display.c_str(), Config->s_NickServ.c_str()); + u->SendMessage(NickServ, offmsg, nc->display.c_str(), Config->s_NickServ.c_str()); } else this->OnSyntaxError(u, "HIDE"); @@ -80,18 +80,18 @@ class CommandNSSetHide : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_HIDE); + u->SendMessage(NickServ, NICK_HELP_SET_HIDE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); + SyntaxError(NickServ, u, "SET HIDE", NICK_SET_HIDE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_HIDE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_HIDE); } }; @@ -104,18 +104,18 @@ class CommandNSSASetHide : public CommandNSSetHide bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_HIDE); + u->SendMessage(NickServ, NICK_HELP_SASET_HIDE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); + SyntaxError(NickServ, u, "SASET HIDE", NICK_SASET_HIDE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_HIDE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_HIDE); } }; diff --git a/modules/core/ns_set_kill.cpp b/modules/core/ns_set_kill.cpp index 2a3448232..7b15f12e2 100644 --- a/modules/core/ns_set_kill.cpp +++ b/modules/core/ns_set_kill.cpp @@ -34,14 +34,14 @@ 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()); + u->SendMessage(NickServ, 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()); + u->SendMessage(NickServ, NICK_SASET_KILL_QUICK, nc->display.c_str()); } else if (param.equals_ci("IMMED")) { @@ -50,17 +50,17 @@ class CommandNSSetKill : public Command 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()); + u->SendMessage(NickServ, NICK_SASET_KILL_IMMED, nc->display.c_str()); } else - notice_lang(Config->s_NickServ, u, NICK_SASET_KILL_IMMED_DISABLED); + u->SendMessage(NickServ, NICK_SET_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()); + u->SendMessage(NickServ, 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); + u->SendMessage(NickServ, 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); + SyntaxError(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); + u->SendMessage(NickServ, 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); + u->SendMessage(NickServ, 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); + SyntaxError(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); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_KILL); } }; diff --git a/modules/core/ns_set_language.cpp b/modules/core/ns_set_language.cpp index 084b97769..146ebf19b 100644 --- a/modules/core/ns_set_language.cpp +++ b/modules/core/ns_set_language.cpp @@ -28,39 +28,46 @@ class CommandNSSetLanguage : public Command Anope::string param = params[1]; - if (param.find_first_not_of("0123456789") != Anope::string::npos) /* i.e. not a number */ + for (unsigned j = 0; j < languages.size(); ++j) { - this->OnSyntaxError(u, ""); - return MOD_CONT; + if (param == "en" || languages[j] == param) + break; + else if (j + 1 == languages.size()) + { + this->OnSyntaxError(u, ""); + return MOD_CONT; + } } - int langnum = convertTo<int>(param) - 1; - if (langnum < 0 || langnum >= NUM_LANGS || langlist[langnum] < 0) - { - notice_lang(Config->s_NickServ, u, NICK_SET_LANGUAGE_UNKNOWN, langnum + 1, Config->s_NickServ.c_str()); - return MOD_CONT; - } - - nc->language = langlist[langnum]; - notice_lang(Config->s_NickServ, u, NICK_SASET_LANGUAGE_CHANGED); + nc->language = param; + u->SendMessage(NickServ, NICK_SET_LANGUAGE_CHANGED); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_LANGUAGE); + u->SendMessage(NickServ, NICK_HELP_SET_LANGUAGE); + u->SendMessage(Config->s_NickServ, " en (English)"); + for (unsigned j = 0; j < languages.size(); ++j) + { + const Anope::string &langname = GetString(languages[j], LANGUAGE_NAME); + if (langname == "English") + continue; + u->SendMessage(Config->s_NickServ, " %s (%s)", languages[j].c_str(), langname.c_str()); + } + return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET LANGUAGE", NICK_SET_LANGUAGE_SYNTAX); + SyntaxError(NickServ, u, "SET LANGUAGE", NICK_SET_LANGUAGE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_LANGUAGE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_LANGUAGE); } }; @@ -73,18 +80,18 @@ class CommandNSSASetLanguage : public CommandNSSetLanguage bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_LANGUAGE); + u->SendMessage(NickServ, NICK_HELP_SASET_LANGUAGE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET LANGUAGE", NICK_SASET_LANGUAGE_SYNTAX); + SyntaxError(NickServ, u, "SASET LANGUAGE", NICK_SASET_LANGUAGE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_LANGUAGE); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_LANGUAGE); } }; diff --git a/modules/core/ns_set_message.cpp b/modules/core/ns_set_message.cpp index 07d64733f..fa20c9162 100644 --- a/modules/core/ns_set_message.cpp +++ b/modules/core/ns_set_message.cpp @@ -28,7 +28,7 @@ class CommandNSSetMessage : public Command if (!Config->UsePrivmsg) { - notice_lang(Config->s_NickServ, u, NICK_SASET_OPTION_DISABLED, "MSG"); + u->SendMessage(NickServ, NICK_SET_OPTION_DISABLED, "MSG"); return MOD_CONT; } @@ -37,12 +37,12 @@ class CommandNSSetMessage : public Command if (param.equals_ci("ON")) { nc->SetFlag(NI_MSG); - notice_lang(Config->s_NickServ, u, NICK_SASET_MSG_ON, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_MSG_ON, nc->display.c_str()); } else if (param.equals_ci("OFF")) { nc->UnsetFlag(NI_MSG); - notice_lang(Config->s_NickServ, u, NICK_SASET_MSG_OFF, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_MSG_OFF, nc->display.c_str()); } else this->OnSyntaxError(u, "MSG"); @@ -52,18 +52,18 @@ class CommandNSSetMessage : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_MSG); + u->SendMessage(NickServ, NICK_HELP_SET_MSG); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX); + SyntaxError(NickServ, u, "SET MSG", NICK_SET_MSG_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_MSG); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_MSG); } }; @@ -76,18 +76,18 @@ class CommandNSSASetMessage : public CommandNSSetMessage bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_MSG); + u->SendMessage(NickServ, NICK_HELP_SASET_MSG); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX); + SyntaxError(NickServ, u, "SASET MSG", NICK_SASET_MSG_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_MSG); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_MSG); } }; diff --git a/modules/core/ns_set_private.cpp b/modules/core/ns_set_private.cpp index 03f52515a..366305eae 100644 --- a/modules/core/ns_set_private.cpp +++ b/modules/core/ns_set_private.cpp @@ -31,12 +31,12 @@ class CommandNSSetPrivate : public Command if (param.equals_ci("ON")) { nc->SetFlag(NI_PRIVATE); - notice_lang(Config->s_NickServ, u, NICK_SASET_PRIVATE_ON, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_PRIVATE_ON, nc->display.c_str()); } else if (param.equals_ci("OFF")) { nc->UnsetFlag(NI_PRIVATE); - notice_lang(Config->s_NickServ, u, NICK_SASET_PRIVATE_OFF, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_PRIVATE_OFF, nc->display.c_str()); } else this->OnSyntaxError(u, "PRIVATE"); @@ -46,18 +46,18 @@ class CommandNSSetPrivate : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_PRIVATE); + u->SendMessage(NickServ, NICK_HELP_SET_PRIVATE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET PRIVATE", NICK_SET_PRIVATE_SYNTAX); + SyntaxError(NickServ, u, "SET PRIVATE", NICK_SET_PRIVATE_SYNTAX); } void OnServHelp(User *u) { - notice_help(Config->s_NickServ, u, NICK_HELP_CMD_SET_PRIVATE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_PRIVATE); } }; @@ -70,18 +70,18 @@ class CommandNSSASetPrivate : public CommandNSSetPrivate bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_PRIVATE); + u->SendMessage(NickServ, NICK_HELP_SASET_PRIVATE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET PRIVATE", NICK_SASET_PRIVATE_SYNTAX); + SyntaxError(NickServ, u, "SASET PRIVATE", NICK_SASET_PRIVATE_SYNTAX); } void OnServHelp(User *u) { - notice_help(Config->s_NickServ, u, NICK_HELP_CMD_SASET_PRIVATE); + u->SendMessage(NickServ, NICK_HELP_CMD_SASET_PRIVATE); } }; diff --git a/modules/core/ns_set_secure.cpp b/modules/core/ns_set_secure.cpp index dac17d6ae..9eaca40fc 100644 --- a/modules/core/ns_set_secure.cpp +++ b/modules/core/ns_set_secure.cpp @@ -31,12 +31,12 @@ class CommandNSSetSecure : public Command if (param.equals_ci("ON")) { nc->SetFlag(NI_SECURE); - notice_lang(Config->s_NickServ, u, NICK_SASET_SECURE_ON, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_SECURE_ON, nc->display.c_str()); } else if (param.equals_ci("OFF")) { nc->UnsetFlag(NI_SECURE); - notice_lang(Config->s_NickServ, u, NICK_SASET_SECURE_OFF, nc->display.c_str()); + u->SendMessage(NickServ, NICK_SASET_SECURE_OFF, nc->display.c_str()); } else this->OnSyntaxError(u, "SECURE"); @@ -46,18 +46,18 @@ class CommandNSSetSecure : public Command bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SET_SECURE); + u->SendMessage(NickServ, NICK_HELP_SET_SECURE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX); + SyntaxError(NickServ, u, "SET SECURE", NICK_SET_SECURE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SET_SECURE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_SECURE); } }; @@ -70,18 +70,18 @@ class CommandNSSASetSecure : public CommandNSSetSecure bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_SASET_SECURE); + u->SendMessage(NickServ, NICK_HELP_SASET_SECURE); return true; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET SECURE", NICK_SASET_SECURE_SYNTAX); + SyntaxError(NickServ, u, "SASET SECURE", NICK_SASET_SECURE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SASET_SECURE); + u->SendMessage(NickServ, NICK_HELP_CMD_SET_SECURE); } }; diff --git a/modules/core/ns_status.cpp b/modules/core/ns_status.cpp index 2ece5c328..dd18d58e6 100644 --- a/modules/core/ns_status.cpp +++ b/modules/core/ns_status.cpp @@ -32,31 +32,31 @@ class CommandNSStatus : public Command while (sep.GetToken(nickbuf)) { if (!(u2 = finduser(nickbuf))) /* Nick is not online */ - notice_lang(Config->s_NickServ, u, NICK_STATUS_REPLY, nickbuf.c_str(), 0, ""); + u->SendMessage(NickServ, NICK_STATUS_REPLY, nickbuf.c_str(), 0, ""); else if (u2->IsIdentified() && na && na->nc == u2->Account()) /* Nick is identified */ - notice_lang(Config->s_NickServ, u, NICK_STATUS_REPLY, nickbuf.c_str(), 3, u2->Account()->display.c_str()); + u->SendMessage(NickServ, NICK_STATUS_REPLY, nickbuf.c_str(), 3, u2->Account()->display.c_str()); else if (u2->IsRecognized()) /* Nick is recognised, but NOT identified */ - notice_lang(Config->s_NickServ, u, NICK_STATUS_REPLY, nickbuf.c_str(), 2, u2->Account() ? u2->Account()->display.c_str() : ""); + u->SendMessage(NickServ, NICK_STATUS_REPLY, nickbuf.c_str(), 2, u2->Account() ? u2->Account()->display.c_str() : ""); else if (!na) /* Nick is online, but NOT a registered */ - notice_lang(Config->s_NickServ, u, NICK_STATUS_REPLY, nickbuf.c_str(), 0, ""); + u->SendMessage(NickServ, NICK_STATUS_REPLY, nickbuf.c_str(), 0, ""); else /* Nick is not identified for the nick, but they could be logged into an account, * so we tell the user about it */ - notice_lang(Config->s_NickServ, u, NICK_STATUS_REPLY, nickbuf.c_str(), 1, u2->Account() ? u2->Account()->display.c_str() : ""); + u->SendMessage(NickServ, NICK_STATUS_REPLY, nickbuf.c_str(), 1, u2->Account() ? u2->Account()->display.c_str() : ""); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_HELP_STATUS); + u->SendMessage(NickServ, NICK_HELP_STATUS); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_STATUS); + u->SendMessage(NickServ, NICK_HELP_CMD_STATUS); } }; diff --git a/modules/core/ns_suspend.cpp b/modules/core/ns_suspend.cpp index 488ed4f04..08c134870 100644 --- a/modules/core/ns_suspend.cpp +++ b/modules/core/ns_suspend.cpp @@ -29,25 +29,25 @@ class CommandNSSuspend : public Command if (readonly) { - notice_lang(Config->s_NickServ, u, READ_ONLY_MODE); + u->SendMessage(NickServ, READ_ONLY_MODE); return MOD_CONT; } if (!(na = findnick(nick))) { - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); return MOD_CONT; } if (Config->NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_CONT; } @@ -77,7 +77,7 @@ class CommandNSSuspend : public Command ircdproto->SendGlobops(NickServ, "\2%s\2 used SUSPEND on \2%s\2", u->nick.c_str(), nick.c_str()); Log(LOG_ADMIN, u, this) << "for " << nick << " (" << (!reason.empty() ? reason : "No reason") << ")"; - notice_lang(Config->s_NickServ, u, NICK_SUSPEND_SUCCEEDED, nick.c_str()); + u->SendMessage(NickServ, NICK_SUSPEND_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickSuspended, OnNickSuspend(na)); @@ -86,18 +86,18 @@ class CommandNSSuspend : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_SUSPEND); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_SUSPEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX); + SyntaxError(NickServ, u, "SUSPEND", NICK_SUSPEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_SUSPEND); + u->SendMessage(NickServ, NICK_HELP_CMD_SUSPEND); } }; @@ -115,25 +115,25 @@ class CommandNSUnSuspend : public Command if (readonly) { - notice_lang(Config->s_NickServ, u, READ_ONLY_MODE); + u->SendMessage(NickServ, READ_ONLY_MODE); return MOD_CONT; } if (!(na = findnick(nick))) { - notice_lang(Config->s_NickServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(NickServ, NICK_X_NOT_REGISTERED, nick.c_str()); return MOD_CONT; } if (na->HasFlag(NS_FORBIDDEN)) { - notice_lang(Config->s_NickServ, u, NICK_X_FORBIDDEN, na->nick.c_str()); + u->SendMessage(NickServ, NICK_X_FORBIDDEN, na->nick.c_str()); return MOD_CONT; } if (Config->NSSecureAdmins && na->nc->IsServicesOper()) { - notice_lang(Config->s_NickServ, u, ACCESS_DENIED); + u->SendMessage(NickServ, ACCESS_DENIED); return MOD_CONT; } @@ -143,7 +143,7 @@ class CommandNSUnSuspend : public Command ircdproto->SendGlobops(NickServ, "\2%s\2 used UNSUSPEND on \2%s\2", u->nick.c_str(), nick.c_str()); Log(LOG_ADMIN, u, this) << "for " << na->nick; - notice_lang(Config->s_NickServ, u, NICK_UNSUSPEND_SUCCEEDED, nick.c_str()); + u->SendMessage(NickServ, NICK_UNSUSPEND_SUCCEEDED, nick.c_str()); FOREACH_MOD(I_OnNickUnsuspended, OnNickUnsuspended(na)); @@ -152,18 +152,18 @@ class CommandNSUnSuspend : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_NickServ, u, NICK_SERVADMIN_HELP_UNSUSPEND); + u->SendMessage(NickServ, NICK_SERVADMIN_HELP_UNSUSPEND); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX); + SyntaxError(NickServ, u, "UNSUSPEND", NICK_UNSUSPEND_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_UNSUSPEND); + u->SendMessage(NickServ, NICK_HELP_CMD_UNSUSPEND); } }; diff --git a/modules/core/ns_update.cpp b/modules/core/ns_update.cpp index e101158a9..bbfad2b45 100644 --- a/modules/core/ns_update.cpp +++ b/modules/core/ns_update.cpp @@ -34,19 +34,19 @@ class CommandNSUpdate : public Command na->last_seen = Anope::CurTime; if (ircd->vhost) do_on_id(u); - notice_lang(Config->s_NickServ, u, NICK_UPDATE_SUCCESS, Config->s_NickServ.c_str()); + u->SendMessage(NickServ, NICK_UPDATE_SUCCESS, Config->s_NickServ.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &) { - notice_help(Config->s_NickServ, u, NICK_HELP_UPDATE); + u->SendMessage(NickServ, NICK_HELP_UPDATE); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_NickServ, u, NICK_HELP_CMD_UPDATE); + u->SendMessage(NickServ, NICK_HELP_CMD_UPDATE); } }; diff --git a/modules/core/os_akill.cpp b/modules/core/os_akill.cpp index 1f4614465..858b71bc1 100644 --- a/modules/core/os_akill.cpp +++ b/modules/core/os_akill.cpp @@ -25,11 +25,11 @@ class AkillDelCallback : public NumberList ~AkillDelCallback() { if (!Deleted) - notice_lang(Config->s_OperServ, u, OPER_AKILL_NO_MATCH); + u->SendMessage(OperServ, OPER_AKILL_NO_MATCH); else if (Deleted == 1) - notice_lang(Config->s_OperServ, u, OPER_AKILL_DELETED_ONE); + u->SendMessage(OperServ, OPER_AKILL_DELETED_ONE); else - notice_lang(Config->s_OperServ, u, OPER_AKILL_DELETED_SEVERAL, Deleted); + u->SendMessage(OperServ, OPER_AKILL_DELETED_SEVERAL, Deleted); } void HandleNumber(unsigned Number) @@ -62,9 +62,9 @@ class AkillListCallback : public NumberList ~AkillListCallback() { if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_AKILL_NO_MATCH); + u->SendMessage(OperServ, OPER_AKILL_NO_MATCH); else - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "Akill"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "Akill"); } void HandleNumber(unsigned Number) @@ -77,7 +77,7 @@ class AkillListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_HEADER); + u->SendMessage(OperServ, OPER_AKILL_LIST_HEADER); } DoList(u, x, Number); @@ -85,7 +85,7 @@ class AkillListCallback : public NumberList static void DoList(User *u, XLine *x, unsigned Number) { - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); } }; @@ -106,7 +106,7 @@ class AkillViewCallback : public AkillListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_AKILL_VIEW_HEADER); + u->SendMessage(OperServ, OPER_AKILL_VIEW_HEADER); } DoList(u, x, Number); @@ -114,14 +114,7 @@ class AkillViewCallback : public AkillListCallback static void DoList(User *u, XLine *x, unsigned Number) { - char timebuf[32]; - struct tm tm; - - tm = *localtime(&x->Created); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); - Anope::string expirebuf = expire_left(u->Account(), x->Expires); - - notice_lang(Config->s_OperServ, u, OPER_AKILL_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), timebuf, expirebuf.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expire_left(u->Account(), x->Expires).c_str(), x->Reason.c_str()); } }; @@ -151,7 +144,7 @@ class CommandOSAKill : public Command /* Do not allow less than a minute expiry time */ if (expires && expires < 60) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -173,7 +166,7 @@ class CommandOSAKill : public Command if (!x) return MOD_CONT; - notice_lang(Config->s_OperServ, u, OPER_AKILL_ADDED, mask.c_str()); + u->SendMessage(OperServ, OPER_AKILL_ADDED, mask.c_str()); if (Config->WallOSAkill) { @@ -209,7 +202,7 @@ class CommandOSAKill : public Command } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } else this->OnSyntaxError(u, "ADD"); @@ -229,7 +222,7 @@ class CommandOSAKill : public Command if (SGLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_EMPTY); + u->SendMessage(OperServ, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -244,18 +237,18 @@ class CommandOSAKill : public Command if (!x) { - notice_lang(Config->s_OperServ, u, OPER_AKILL_NOT_FOUND, mask.c_str()); + u->SendMessage(OperServ, OPER_AKILL_NOT_FOUND, mask.c_str()); return MOD_CONT; } FOREACH_MOD(I_OnDelAkill, OnDelAkill(u, x)); AkillDelCallback::DoDel(u, x); - notice_lang(Config->s_OperServ, u, OPER_AKILL_DELETED, mask.c_str()); + u->SendMessage(OperServ, OPER_AKILL_DELETED, mask.c_str()); } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } @@ -264,7 +257,7 @@ class CommandOSAKill : public Command { if (SGLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_EMPTY); + u->SendMessage(OperServ, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -288,7 +281,7 @@ class CommandOSAKill : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_HEADER); + u->SendMessage(OperServ, OPER_AKILL_LIST_HEADER); } AkillListCallback::DoList(u, x, i); @@ -296,9 +289,9 @@ class CommandOSAKill : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_AKILL_NO_MATCH); + u->SendMessage(OperServ, OPER_AKILL_NO_MATCH); else - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "Akill"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "Akill"); } return MOD_CONT; @@ -308,7 +301,7 @@ class CommandOSAKill : public Command { if (SGLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_AKILL_LIST_EMPTY); + u->SendMessage(OperServ, OPER_AKILL_LIST_EMPTY); return MOD_CONT; } @@ -332,7 +325,7 @@ class CommandOSAKill : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_AKILL_VIEW_HEADER); + u->SendMessage(OperServ, OPER_AKILL_VIEW_HEADER); } AkillViewCallback::DoList(u, x, i); @@ -340,7 +333,7 @@ class CommandOSAKill : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_AKILL_NO_MATCH); + u->SendMessage(OperServ, OPER_AKILL_NO_MATCH); } return MOD_CONT; @@ -350,7 +343,7 @@ class CommandOSAKill : public Command { FOREACH_MOD(I_OnDelAkill, OnDelAkill(u, NULL)); SGLine->Clear(); - notice_lang(Config->s_OperServ, u, OPER_AKILL_CLEAR); + u->SendMessage(OperServ, OPER_AKILL_CLEAR); return MOD_CONT; } @@ -380,18 +373,18 @@ class CommandOSAKill : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_AKILL); + u->SendMessage(OperServ, OPER_HELP_AKILL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "AKILL", OPER_AKILL_SYNTAX); + SyntaxError(OperServ, u, "AKILL", OPER_AKILL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_AKILL); + u->SendMessage(OperServ, OPER_HELP_CMD_AKILL); } }; diff --git a/modules/core/os_chankill.cpp b/modules/core/os_chankill.cpp index 81b15710a..7bed3220e 100644 --- a/modules/core/os_chankill.cpp +++ b/modules/core/os_chankill.cpp @@ -40,7 +40,7 @@ class CommandOSChanKill : public Command expires *= 86400; if (expires && expires < 60) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -79,25 +79,25 @@ class CommandOSChanKill : public Command ircdproto->SendGlobops(OperServ, "%s used CHANKILL on %s (%s)", u->nick.c_str(), channel.c_str(), realreason.c_str()); } else - notice_lang(Config->s_OperServ, u, CHAN_X_NOT_IN_USE, channel.c_str()); + u->SendMessage(OperServ, CHAN_X_NOT_IN_USE, channel.c_str()); } return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_CHANKILL); + u->SendMessage(OperServ, OPER_HELP_CHANKILL); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX); + SyntaxError(OperServ, u, "CHANKILL", OPER_CHANKILL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_CHANKILL); + u->SendMessage(OperServ, OPER_HELP_CMD_CHANKILL); } }; diff --git a/modules/core/os_chanlist.cpp b/modules/core/os_chanlist.cpp index 87b3d736d..a8527a9df 100644 --- a/modules/core/os_chanlist.cpp +++ b/modules/core/os_chanlist.cpp @@ -35,7 +35,7 @@ class CommandOSChanList : public Command if (!pattern.empty() && (u2 = finduser(pattern))) { - notice_lang(Config->s_OperServ, u, OPER_CHANLIST_HEADER_USER, u2->nick.c_str()); + u->SendMessage(OperServ, OPER_CHANLIST_HEADER_USER, u2->nick.c_str()); for (UChannelList::iterator uit = u2->chans.begin(), uit_end = u2->chans.end(); uit != uit_end; ++uit) { @@ -46,12 +46,12 @@ class CommandOSChanList : public Command if (!cc->chan->HasMode(*it)) continue; - notice_lang(Config->s_OperServ, u, OPER_CHANLIST_RECORD, cc->chan->name.c_str(), cc->chan->users.size(), cc->chan->GetModes(true, true).c_str(), !cc->chan->topic.empty() ? cc->chan->topic.c_str() : ""); + u->SendMessage(OperServ, OPER_CHANLIST_RECORD, cc->chan->name.c_str(), cc->chan->users.size(), cc->chan->GetModes(true, true).c_str(), !cc->chan->topic.empty() ? cc->chan->topic.c_str() : ""); } } else { - notice_lang(Config->s_OperServ, u, OPER_CHANLIST_HEADER); + u->SendMessage(OperServ, OPER_CHANLIST_HEADER); for (channel_map::const_iterator cit = ChannelList.begin(), cit_end = ChannelList.end(); cit != cit_end; ++cit) { @@ -64,23 +64,23 @@ class CommandOSChanList : public Command if (!c->HasMode(*it)) continue; - notice_lang(Config->s_OperServ, u, OPER_CHANLIST_RECORD, c->name.c_str(), c->users.size(), c->GetModes(true, true).c_str(), !c->topic.empty() ? c->topic.c_str() : ""); + u->SendMessage(OperServ, OPER_CHANLIST_RECORD, c->name.c_str(), c->users.size(), c->GetModes(true, true).c_str(), !c->topic.empty() ? c->topic.c_str() : ""); } } - notice_lang(Config->s_OperServ, u, OPER_CHANLIST_END); + u->SendMessage(OperServ, OPER_CHANLIST_END); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_CHANLIST); + u->SendMessage(OperServ, OPER_HELP_CHANLIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_CHANLIST); + u->SendMessage(OperServ, OPER_HELP_CMD_CHANLIST); } }; diff --git a/modules/core/os_clearmodes.cpp b/modules/core/os_clearmodes.cpp index 56567568b..0042ac58f 100644 --- a/modules/core/os_clearmodes.cpp +++ b/modules/core/os_clearmodes.cpp @@ -30,12 +30,12 @@ class CommandOSClearModes : public Command if (!(c = findchan(chan))) { - notice_lang(Config->s_OperServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(OperServ, CHAN_X_NOT_IN_USE, chan.c_str()); return MOD_CONT; } else if (c->bouncy_modes) { - notice_lang(Config->s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + u->SendMessage(OperServ, OPER_BOUNCY_MODES_U_LINE); return MOD_CONT; } else @@ -148,27 +148,27 @@ class CommandOSClearModes : public Command } if (all) - notice_lang(Config->s_OperServ, u, OPER_CLEARMODES_ALL_DONE, chan.c_str()); + u->SendMessage(OperServ, OPER_CLEARMODES_ALL_DONE, chan.c_str()); else - notice_lang(Config->s_OperServ, u, OPER_CLEARMODES_DONE, chan.c_str()); + u->SendMessage(OperServ, OPER_CLEARMODES_DONE, chan.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_CLEARMODES); + u->SendMessage(OperServ, OPER_HELP_CLEARMODES); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX); + SyntaxError(OperServ, u, "CLEARMODES", OPER_CLEARMODES_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_CLEARMODES); + u->SendMessage(OperServ, OPER_HELP_CMD_CLEARMODES); } }; diff --git a/modules/core/os_defcon.cpp b/modules/core/os_defcon.cpp index 18a1ecfa0..525aa9b94 100644 --- a/modules/core/os_defcon.cpp +++ b/modules/core/os_defcon.cpp @@ -33,14 +33,14 @@ class DefConTimeout : public Timer Config->DefConLevel = level; FOREACH_MOD(I_OnDefconLevel, OnDefconLevel(level)); Log(OperServ, "operserv/defcon") << "Defcon level timeout, returning to level " << level; - ircdproto->SendGlobops(OperServ, getstring(OPER_DEFCON_WALL), Config->s_OperServ.c_str(), level); + ircdproto->SendGlobops(OperServ, GetString(OPER_DEFCON_WALL).c_str(), Config->s_OperServ.c_str(), level); if (Config->GlobalOnDefcon) { if (!Config->DefConOffMessage.empty()) oper_global("", "%s", Config->DefConOffMessage.c_str()); else - oper_global("", getstring(DEFCON_GLOBAL), Config->DefConLevel); + oper_global("", GetString(DEFCON_GLOBAL).c_str(), Config->DefConLevel); if (Config->GlobalOnDefconMore && Config->DefConOffMessage.empty()) oper_global("", "%s", Config->DefconMessage.c_str()); @@ -63,11 +63,10 @@ class CommandOSDefcon : public Command { Anope::string lvl = params[0]; int newLevel = 0; - const char *langglobal = getstring(DEFCON_GLOBAL); if (lvl.empty()) { - notice_lang(Config->s_OperServ, u, OPER_DEFCON_CHANGED, Config->DefConLevel); + u->SendMessage(OperServ, OPER_DEFCON_CHANGED, Config->DefConLevel); defcon_sendlvls(u); return MOD_CONT; } @@ -90,10 +89,10 @@ class CommandOSDefcon : public Command if (Config->DefConTimeOut) timeout = new DefConTimeout(5); - notice_lang(Config->s_OperServ, u, OPER_DEFCON_CHANGED, Config->DefConLevel); + u->SendMessage(OperServ, OPER_DEFCON_CHANGED, Config->DefConLevel); defcon_sendlvls(u); Log(LOG_ADMIN, u, this) << "to change defcon level to " << newLevel; - ircdproto->SendGlobops(OperServ, getstring(OPER_DEFCON_WALL), u->nick.c_str(), newLevel); + ircdproto->SendGlobops(OperServ, GetString(OPER_DEFCON_WALL).c_str(), u->nick.c_str(), newLevel); /* Global notice the user what is happening. Also any Message that the Admin would like to add. Set in config file. */ if (Config->GlobalOnDefcon) @@ -101,7 +100,7 @@ class CommandOSDefcon : public Command if (Config->DefConLevel == 5 && !Config->DefConOffMessage.empty()) oper_global("", "%s", Config->DefConOffMessage.c_str()); else - oper_global("", langglobal, Config->DefConLevel); + oper_global("", GetString(DEFCON_GLOBAL).c_str(), Config->DefConLevel); } if (Config->GlobalOnDefconMore) { @@ -115,18 +114,18 @@ class CommandOSDefcon : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_DEFCON); + u->SendMessage(OperServ, OPER_HELP_DEFCON); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX); + SyntaxError(OperServ, u, "DEFCON", OPER_DEFCON_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_DEFCON); + u->SendMessage(OperServ, OPER_HELP_CMD_DEFCON); } }; @@ -216,7 +215,7 @@ class OSDefcon : public Module if ((CheckDefCon(DEFCON_OPER_ONLY) || CheckDefCon(DEFCON_SILENT_OPER_ONLY)) && !is_oper(u)) { if (!CheckDefCon(DEFCON_SILENT_OPER_ONLY)) - notice_lang(bi->nick, u, OPER_DEFCON_DENIED); + u->SendMessage(bi, OPER_DEFCON_DENIED); return EVENT_STOP; } @@ -232,7 +231,7 @@ class OSDefcon : public Module { if (CheckDefCon(DEFCON_NO_NEW_NICKS)) { - notice_lang(Config->s_NickServ, u, OPER_DEFCON_DENIED); + u->SendMessage(NickServ, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -243,7 +242,7 @@ class OSDefcon : public Module { if (!params.empty() && params[0].equals_ci("MLOCK") && CheckDefCon(DEFCON_NO_MLOCK_CHANGE)) { - notice_lang(Config->s_ChanServ, u, OPER_DEFCON_DENIED); + u->SendMessage(ChanServ, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -251,7 +250,7 @@ class OSDefcon : public Module { if (CheckDefCon(DEFCON_NO_NEW_CHANNELS)) { - notice_lang(Config->s_ChanServ, u, OPER_DEFCON_DENIED); + u->SendMessage(ChanServ, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -262,7 +261,7 @@ class OSDefcon : public Module { if (CheckDefCon(DEFCON_NO_NEW_MEMOS)) { - notice_lang(Config->s_MemoServ, u, OPER_DEFCON_DENIED); + u->SendMessage(MemoServ, OPER_DEFCON_DENIED); return EVENT_STOP; } } @@ -323,25 +322,25 @@ class OSDefcon : public Module void defcon_sendlvls(User *u) { if (CheckDefCon(DEFCON_NO_NEW_CHANNELS)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CHANNELS); + u->SendMessage(OperServ, OPER_HELP_DEFCON_NO_NEW_CHANNELS); if (CheckDefCon(DEFCON_NO_NEW_NICKS)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_NICKS); + u->SendMessage(OperServ, OPER_HELP_DEFCON_NO_NEW_NICKS); if (CheckDefCon(DEFCON_NO_MLOCK_CHANGE)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_NO_MLOCK_CHANGE); + u->SendMessage(OperServ, OPER_HELP_DEFCON_NO_MLOCK_CHANGE); if (CheckDefCon(DEFCON_FORCE_CHAN_MODES) && !Config->DefConChanModes.empty()) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_FORCE_CHAN_MODES, Config->DefConChanModes.c_str()); + u->SendMessage(OperServ, OPER_HELP_DEFCON_FORCE_CHAN_MODES, Config->DefConChanModes.c_str()); if (CheckDefCon(DEFCON_REDUCE_SESSION)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_REDUCE_SESSION, Config->DefConSessionLimit); + u->SendMessage(OperServ, OPER_HELP_DEFCON_REDUCE_SESSION, Config->DefConSessionLimit); if (CheckDefCon(DEFCON_NO_NEW_CLIENTS)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_CLIENTS); + u->SendMessage(OperServ, OPER_HELP_DEFCON_NO_NEW_CLIENTS); if (CheckDefCon(DEFCON_OPER_ONLY)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_OPER_ONLY); + u->SendMessage(OperServ, OPER_HELP_DEFCON_OPER_ONLY); if (CheckDefCon(DEFCON_SILENT_OPER_ONLY)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_SILENT_OPER_ONLY); + u->SendMessage(OperServ, OPER_HELP_DEFCON_SILENT_OPER_ONLY); if (CheckDefCon(DEFCON_AKILL_NEW_CLIENTS)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS); + u->SendMessage(OperServ, OPER_HELP_DEFCON_AKILL_NEW_CLIENTS); if (CheckDefCon(DEFCON_NO_NEW_MEMOS)) - notice_lang(Config->s_OperServ, u, OPER_HELP_DEFCON_NO_NEW_MEMOS); + u->SendMessage(OperServ, OPER_HELP_DEFCON_NO_NEW_MEMOS); } void runDefCon() diff --git a/modules/core/os_global.cpp b/modules/core/os_global.cpp index 949421470..961a70ab4 100644 --- a/modules/core/os_global.cpp +++ b/modules/core/os_global.cpp @@ -32,18 +32,18 @@ class CommandOSGlobal : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_GLOBAL, Config->s_GlobalNoticer.c_str()); + u->SendMessage(OperServ, OPER_HELP_GLOBAL, Config->s_GlobalNoticer.c_str()); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX); + SyntaxError(OperServ, u, "GLOBAL", OPER_GLOBAL_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_GLOBAL); + u->SendMessage(OperServ, OPER_HELP_CMD_GLOBAL); } }; diff --git a/modules/core/os_help.cpp b/modules/core/os_help.cpp index 229dce8ee..a626ddf28 100644 --- a/modules/core/os_help.cpp +++ b/modules/core/os_help.cpp @@ -28,11 +28,11 @@ class CommandOSHelp : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP); + u->SendMessage(OperServ, OPER_HELP); for (CommandMap::const_iterator it = OperServ->Commands.begin(), it_end = OperServ->Commands.end(); it != it_end; ++it) if (!Config->HidePrivilegedCommands || it->second->permission.empty() || (u->Account() && u->Account()->HasCommand(it->second->permission))) it->second->OnServHelp(u); - notice_help(Config->s_OperServ, u, OPER_HELP_LOGGED); + u->SendMessage(OperServ, OPER_HELP_LOGGED); } }; diff --git a/modules/core/os_ignore.cpp b/modules/core/os_ignore.cpp index 9cb5cf4d2..38fc716fd 100644 --- a/modules/core/os_ignore.cpp +++ b/modules/core/os_ignore.cpp @@ -33,18 +33,18 @@ class CommandOSIgnore : public Command if (t <= -1) { - notice_lang(Config->s_OperServ, u, OPER_IGNORE_VALID_TIME); + u->SendMessage(OperServ, OPER_IGNORE_VALID_TIME); return MOD_CONT; } else if (!t) { add_ignore(nick, t); - notice_lang(Config->s_OperServ, u, OPER_IGNORE_PERM_DONE, nick.c_str()); + u->SendMessage(OperServ, OPER_IGNORE_PERM_DONE, nick.c_str()); } else { add_ignore(nick, t); - notice_lang(Config->s_OperServ, u, OPER_IGNORE_TIME_DONE, nick.c_str(), time.c_str()); + u->SendMessage(OperServ, OPER_IGNORE_TIME_DONE, nick.c_str(), time.c_str()); } } @@ -55,11 +55,11 @@ class CommandOSIgnore : public Command { if (ignore.empty()) { - notice_lang(Config->s_OperServ, u, OPER_IGNORE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_IGNORE_LIST_EMPTY); return MOD_CONT; } - notice_lang(Config->s_OperServ, u, OPER_IGNORE_LIST); + u->SendMessage(OperServ, OPER_IGNORE_LIST); for (std::list<IgnoreData *>::iterator ign = ignore.begin(), ign_end = ignore.end(); ign != ign_end; ++ign) u->SendMessage(Config->s_OperServ, "%s", (*ign)->mask.c_str()); @@ -75,10 +75,10 @@ class CommandOSIgnore : public Command { if (delete_ignore(nick)) { - notice_lang(Config->s_OperServ, u, OPER_IGNORE_DEL_DONE, nick.c_str()); + u->SendMessage(OperServ, OPER_IGNORE_DEL_DONE, nick.c_str()); return MOD_CONT; } - notice_lang(Config->s_OperServ, u, OPER_IGNORE_LIST_NOMATCH, nick.c_str()); + u->SendMessage(OperServ, OPER_IGNORE_LIST_NOMATCH, nick.c_str()); } return MOD_CONT; @@ -87,7 +87,7 @@ class CommandOSIgnore : public Command CommandReturn DoClear(User *u) { clear_ignores(); - notice_lang(Config->s_OperServ, u, OPER_IGNORE_LIST_CLEARED); + u->SendMessage(OperServ, OPER_IGNORE_LIST_CLEARED); return MOD_CONT; } @@ -116,18 +116,18 @@ class CommandOSIgnore : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_IGNORE); + u->SendMessage(OperServ, OPER_HELP_IGNORE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX); + SyntaxError(OperServ, u, "IGNORE", OPER_IGNORE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_IGNORE); + u->SendMessage(OperServ, OPER_HELP_CMD_IGNORE); } }; diff --git a/modules/core/os_jupe.cpp b/modules/core/os_jupe.cpp index 59ba88179..c12f6e754 100644 --- a/modules/core/os_jupe.cpp +++ b/modules/core/os_jupe.cpp @@ -27,9 +27,9 @@ class CommandOSJupe : public Command Server *server = Server::Find(jserver); if (!isValidHost(jserver, 3)) - notice_lang(Config->s_OperServ, u, OPER_JUPE_HOST_ERROR); + u->SendMessage(OperServ, OPER_JUPE_HOST_ERROR); else if (server && (server == Me || server == Me->GetLinks().front())) - notice_lang(Config->s_OperServ, u, OPER_JUPE_INVALID_SERVER); + u->SendMessage(OperServ, OPER_JUPE_INVALID_SERVER); else { Anope::string rbuf = "Juped by " + u->nick + (!reason.empty() ? ": " + reason : ""); @@ -46,18 +46,18 @@ class CommandOSJupe : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_JUPE); + u->SendMessage(OperServ, OPER_HELP_JUPE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX); + SyntaxError(OperServ, u, "JUPE", OPER_JUPE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_JUPE); + u->SendMessage(OperServ, OPER_HELP_CMD_JUPE); } }; diff --git a/modules/core/os_kick.cpp b/modules/core/os_kick.cpp index 0cef0ec84..a1fc22d02 100644 --- a/modules/core/os_kick.cpp +++ b/modules/core/os_kick.cpp @@ -28,17 +28,17 @@ class CommandOSKick : public Command if (!(c = findchan(chan))) { - notice_lang(Config->s_OperServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(OperServ, CHAN_X_NOT_IN_USE, chan.c_str()); return MOD_CONT; } else if (c->bouncy_modes) { - notice_lang(Config->s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + u->SendMessage(OperServ, OPER_BOUNCY_MODES_U_LINE); return MOD_CONT; } else if (!(u2 = finduser(nick))) { - notice_lang(Config->s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(OperServ, NICK_X_NOT_IN_USE, nick.c_str()); return MOD_CONT; } @@ -50,18 +50,18 @@ class CommandOSKick : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_KICK); + u->SendMessage(OperServ, OPER_HELP_KICK); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "KICK", OPER_KICK_SYNTAX); + SyntaxError(OperServ, u, "KICK", OPER_KICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_KICK); + u->SendMessage(OperServ, OPER_HELP_CMD_KICK); } }; diff --git a/modules/core/os_mode.cpp b/modules/core/os_mode.cpp index fc005624f..64f4a6329 100644 --- a/modules/core/os_mode.cpp +++ b/modules/core/os_mode.cpp @@ -26,9 +26,9 @@ class CommandOSMode : public Command Channel *c; if (!(c = findchan(chan))) - notice_lang(Config->s_OperServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(OperServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (c->bouncy_modes) - notice_lang(Config->s_OperServ, u, OPER_BOUNCY_MODES_U_LINE); + u->SendMessage(OperServ, OPER_BOUNCY_MODES_U_LINE); else { c->SetModes(OperServ, false, modes.c_str()); @@ -41,18 +41,18 @@ class CommandOSMode : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_MODE); + u->SendMessage(OperServ, OPER_HELP_MODE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "MODE", OPER_MODE_SYNTAX); + SyntaxError(OperServ, u, "MODE", OPER_MODE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_MODE); + u->SendMessage(OperServ, OPER_HELP_CMD_MODE); } }; diff --git a/modules/core/os_modinfo.cpp b/modules/core/os_modinfo.cpp index c689786db..218599f47 100644 --- a/modules/core/os_modinfo.cpp +++ b/modules/core/os_modinfo.cpp @@ -25,15 +25,11 @@ class CommandOSModInfo : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { Anope::string file = params[0]; - struct tm tm; - char timebuf[64]; Module *m = FindModule(file); if (m) { - tm = *localtime(&m->created); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, &tm); - notice_lang(Config->s_OperServ, u, OPER_MODULE_INFO_LIST, m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", timebuf); + u->SendMessage(OperServ, OPER_MODULE_INFO_LIST, m->name.c_str(), !m->version.empty() ? m->version.c_str() : "?", !m->author.empty() ? m->author.c_str() : "?", do_strftime(m->created).c_str()); showModuleCmdLoaded(HostServ, m->name, u); showModuleCmdLoaded(OperServ, m->name, u); @@ -43,25 +39,25 @@ class CommandOSModInfo : public Command showModuleCmdLoaded(MemoServ, m->name, u); } else - notice_lang(Config->s_OperServ, u, OPER_MODULE_NO_INFO, file.c_str()); + u->SendMessage(OperServ, OPER_MODULE_NO_INFO, file.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_MODINFO); + u->SendMessage(OperServ, OPER_HELP_MODINFO); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX); + SyntaxError(OperServ, u, "MODINFO", OPER_MODULE_INFO_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_MODINFO); + u->SendMessage(OperServ, OPER_HELP_CMD_MODINFO); } }; @@ -92,7 +88,7 @@ static int showModuleCmdLoaded(BotInfo *bi, const Anope::string &mod_name, User if (c->module && c->module->name.equals_ci(mod_name) && c->service) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_CMD_LIST, c->service->nick.c_str(), c->name.c_str()); + u->SendMessage(OperServ, OPER_MODULE_CMD_LIST, c->service->nick.c_str(), c->name.c_str()); ++display; } } diff --git a/modules/core/os_modlist.cpp b/modules/core/os_modlist.cpp index 58cd2d6c6..78c777a7a 100644 --- a/modules/core/os_modlist.cpp +++ b/modules/core/os_modlist.cpp @@ -129,7 +129,7 @@ class CommandOSModList : public Command } } - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST_HEADER); + u->SendMessage(OperServ, OPER_MODULE_LIST_HEADER); for (std::list<Module *>::iterator it = Modules.begin(), it_end = Modules.end(); it != it_end; ++it) { @@ -140,56 +140,56 @@ class CommandOSModList : public Command case CORE: if (showCore) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), core); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), core); ++count; } break; case THIRD: if (showThird) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), third); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), third); ++count; } break; case PROTOCOL: if (showProto) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), proto); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), proto); ++count; } break; case SUPPORTED: if (showSupported) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), supported); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), supported); ++count; } break; case QATESTED: if (showQA) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), qa); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), qa); ++count; } break; case ENCRYPTION: if (showEnc) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), enc); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), enc); ++count; } break; case DATABASE: if (showDB) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), db); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), db); ++count; } break; case SOCKETENGINE: if (showSocketEngine) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), socketengine); + u->SendMessage(OperServ, OPER_MODULE_LIST, m->name.c_str(), m->version.c_str(), socketengine); ++count; } break; @@ -198,22 +198,22 @@ class CommandOSModList : public Command } } if (!count) - notice_lang(Config->s_OperServ, u, OPER_MODULE_NO_LIST); + u->SendMessage(OperServ, OPER_MODULE_NO_LIST); else - notice_lang(Config->s_OperServ, u, OPER_MODULE_LIST_FOOTER, count); + u->SendMessage(OperServ, OPER_MODULE_LIST_FOOTER, count); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_MODLIST); + u->SendMessage(OperServ, OPER_HELP_MODLIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_MODLIST); + u->SendMessage(OperServ, OPER_HELP_CMD_MODLIST); } }; diff --git a/modules/core/os_modload.cpp b/modules/core/os_modload.cpp index 0d36ad567..b35cf0730 100644 --- a/modules/core/os_modload.cpp +++ b/modules/core/os_modload.cpp @@ -27,14 +27,14 @@ class CommandOSModLoad : public Command Module *m = FindModule(mname); if (m) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_ALREADY_LOADED, mname.c_str()); + u->SendMessage(OperServ, OPER_MODULE_ALREADY_LOADED, mname.c_str()); return MOD_CONT; } int status = ModuleManager::LoadModule(mname, u); if (status != MOD_ERR_OK) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_LOAD_FAIL, mname.c_str()); + u->SendMessage(OperServ, OPER_MODULE_LOAD_FAIL, mname.c_str()); } return MOD_CONT; @@ -42,18 +42,18 @@ class CommandOSModLoad : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_MODLOAD); + u->SendMessage(OperServ, OPER_HELP_MODLOAD); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX); + SyntaxError(OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_MODLOAD); + u->SendMessage(OperServ, OPER_HELP_CMD_MODLOAD); } }; diff --git a/modules/core/os_modunload.cpp b/modules/core/os_modunload.cpp index 801714a16..cf00676c4 100644 --- a/modules/core/os_modunload.cpp +++ b/modules/core/os_modunload.cpp @@ -28,7 +28,7 @@ class CommandOSModUnLoad : public Command Module *m = FindModule(mname); if (!m) { - notice_lang(Config->s_OperServ, u, OPER_MODULE_ISNT_LOADED, mname.c_str()); + u->SendMessage(OperServ, OPER_MODULE_ISNT_LOADED, mname.c_str()); return MOD_CONT; } @@ -37,25 +37,25 @@ class CommandOSModUnLoad : public Command status = ModuleManager::UnloadModule(m, u); if (status != MOD_ERR_OK) - notice_lang(Config->s_OperServ, u, OPER_MODULE_REMOVE_FAIL, mname.c_str()); + u->SendMessage(OperServ, OPER_MODULE_REMOVE_FAIL, mname.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_MODUNLOAD); + u->SendMessage(OperServ, OPER_HELP_MODUNLOAD); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "MODUNLOAD", OPER_MODULE_UNLOAD_SYNTAX); + SyntaxError(OperServ, u, "MODUNLOAD", OPER_MODULE_UNLOAD_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_MODUNLOAD); + u->SendMessage(OperServ, OPER_HELP_CMD_MODUNLOAD); } }; diff --git a/modules/core/os_news.cpp b/modules/core/os_news.cpp index f77db4494..878e286e6 100644 --- a/modules/core/os_news.cpp +++ b/modules/core/os_news.cpp @@ -21,10 +21,8 @@ enum { MSG_SYNTAX, MSG_LIST_HEADER, - MSG_LIST_ENTRY, MSG_LIST_NONE, MSG_ADD_SYNTAX, - MSG_ADD_FULL, MSG_ADDED, MSG_DEL_SYNTAX, MSG_DEL_NOT_FOUND, @@ -33,14 +31,12 @@ enum MSG_DELETED_ALL }; -struct newsmsgs msgarray[] = { +struct NewsMessages msgarray[] = { {NEWS_LOGON, "LOGON", {NEWS_LOGON_SYNTAX, NEWS_LOGON_LIST_HEADER, - NEWS_LOGON_LIST_ENTRY, NEWS_LOGON_LIST_NONE, NEWS_LOGON_ADD_SYNTAX, - NEWS_LOGON_ADD_FULL, NEWS_LOGON_ADDED, NEWS_LOGON_DEL_SYNTAX, NEWS_LOGON_DEL_NOT_FOUND, @@ -51,10 +47,8 @@ struct newsmsgs msgarray[] = { {NEWS_OPER, "OPER", {NEWS_OPER_SYNTAX, NEWS_OPER_LIST_HEADER, - NEWS_OPER_LIST_ENTRY, NEWS_OPER_LIST_NONE, NEWS_OPER_ADD_SYNTAX, - NEWS_OPER_ADD_FULL, NEWS_OPER_ADDED, NEWS_OPER_DEL_SYNTAX, NEWS_OPER_DEL_NOT_FOUND, @@ -65,10 +59,8 @@ struct newsmsgs msgarray[] = { {NEWS_RANDOM, "RANDOM", {NEWS_RANDOM_SYNTAX, NEWS_RANDOM_LIST_HEADER, - NEWS_RANDOM_LIST_ENTRY, NEWS_RANDOM_LIST_NONE, NEWS_RANDOM_ADD_SYNTAX, - NEWS_RANDOM_ADD_FULL, NEWS_RANDOM_ADDED, NEWS_RANDOM_DEL_SYNTAX, NEWS_RANDOM_DEL_NOT_FOUND, @@ -80,7 +72,7 @@ struct newsmsgs msgarray[] = { static void DisplayNews(User *u, NewsType Type) { - int msg; + LanguageString msg; static unsigned current_news = 0; if (Type == NEWS_LOGON) @@ -98,17 +90,12 @@ static void DisplayNews(User *u, NewsType Type) { if (News[i]->type == Type) { - tm *tm; - char timebuf[64]; - NewsExists = true; if (Type == NEWS_RANDOM && i == current_news) continue; - tm = localtime(&News[i]->time); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, tm); - notice_lang(Config->s_GlobalNoticer, u, msg, timebuf, News[i]->Text.c_str()); + u->SendMessage(Global, msg, do_strftime(News[i]->time).c_str(), News[i]->Text.c_str()); ++displayed; @@ -165,7 +152,7 @@ static int del_newsitem(unsigned num, NewsType type) return count; } -static int *findmsgs(NewsType type, Anope::string &type_name) +static LanguageString *findmsgs(NewsType type, Anope::string &type_name) { for (unsigned i = 0; i < lenof(msgarray); ++i) if (msgarray[i].type == type) @@ -179,31 +166,27 @@ static int *findmsgs(NewsType type, Anope::string &type_name) class NewsBase : public Command { protected: - CommandReturn DoList(User *u, NewsType type, int *msgs) + CommandReturn DoList(User *u, NewsType type, LanguageString *msgs) { int count = 0; - char timebuf[64]; - struct tm *tm; for (unsigned i = 0, end = News.size(); i < end; ++i) if (News[i]->type == type) { if (!count) - notice_lang(Config->s_OperServ, u, msgs[MSG_LIST_HEADER]); - tm = localtime(&News[i]->time); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_OperServ, u, msgs[MSG_LIST_ENTRY], News[i]->num, timebuf, !News[i]->who.empty() ? News[i]->who.c_str() : "<unknown>", News[i]->Text.c_str()); + u->SendMessage(OperServ, msgs[MSG_LIST_HEADER]); + u->SendMessage(OperServ, NEWS_LIST_ENTRY, News[i]->num, do_strftime(News[i]->time).c_str(), !News[i]->who.empty() ? News[i]->who.c_str() : "<unknown>", News[i]->Text.c_str()); ++count; } if (!count) - notice_lang(Config->s_OperServ, u, msgs[MSG_LIST_NONE]); + u->SendMessage(OperServ, msgs[MSG_LIST_NONE]); else - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "News"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "News"); return MOD_CONT; } - CommandReturn DoAdd(User *u, const std::vector<Anope::string> ¶ms, NewsType type, int *msgs) + CommandReturn DoAdd(User *u, const std::vector<Anope::string> ¶ms, NewsType type, LanguageString *msgs) { Anope::string text = params.size() > 1 ? params[1] : ""; int n; @@ -214,20 +197,20 @@ class NewsBase : public Command { if (readonly) { - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } n = add_newsitem(u, text, type); if (n < 0) - notice_lang(Config->s_OperServ, u, msgs[MSG_ADD_FULL]); + u->SendMessage(OperServ, NEWS_ADD_FULL); else - notice_lang(Config->s_OperServ, u, msgs[MSG_ADDED], n); + u->SendMessage(OperServ, msgs[MSG_ADDED], n); } return MOD_CONT; } - CommandReturn DoDel(User *u, const std::vector<Anope::string> ¶ms, NewsType type, int *msgs) + CommandReturn DoDel(User *u, const std::vector<Anope::string> ¶ms, NewsType type, LanguageString *msgs) { Anope::string text = params.size() > 1 ? params[1] : ""; unsigned num; @@ -238,7 +221,7 @@ class NewsBase : public Command { if (readonly) { - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } if (!text.equals_ci("ALL")) @@ -246,20 +229,20 @@ class NewsBase : public Command num = text.is_pos_number_only() ? convertTo<unsigned>(text) : 0; if (num > 0 && del_newsitem(num, type)) { - notice_lang(Config->s_OperServ, u, msgs[MSG_DELETED], num); + u->SendMessage(OperServ, msgs[MSG_DELETED], num); for (unsigned i = 0, end = News.size(); i < end; ++i) if (News[i]->type == type && News[i]->num > num) --News[i]->num; } else - notice_lang(Config->s_OperServ, u, msgs[MSG_DEL_NOT_FOUND], num); + u->SendMessage(OperServ, msgs[MSG_DEL_NOT_FOUND], num); } else { if (del_newsitem(0, type)) - notice_lang(Config->s_OperServ, u, msgs[MSG_DELETED_ALL]); + u->SendMessage(OperServ, msgs[MSG_DELETED_ALL]); else - notice_lang(Config->s_OperServ, u, msgs[MSG_DEL_NONE]); + u->SendMessage(OperServ, msgs[MSG_DEL_NONE]); } } @@ -270,9 +253,8 @@ class NewsBase : public Command { Anope::string cmd = params[0]; Anope::string type_name; - int *msgs; - msgs = findmsgs(type, type_name); + LanguageString *msgs = findmsgs(type, type_name); if (!msgs) throw CoreException("news: Invalid type to do_news()"); @@ -317,18 +299,18 @@ class CommandOSLogonNews : public NewsBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, NEWS_HELP_LOGON, Config->NewsCount); + u->SendMessage(OperServ, NEWS_HELP_LOGON, Config->NewsCount); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "LOGONNEWS", NEWS_LOGON_SYNTAX); + SyntaxError(OperServ, u, "LOGONNEWS", NEWS_LOGON_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_LOGONNEWS); + u->SendMessage(OperServ, OPER_HELP_CMD_LOGONNEWS); } }; @@ -346,18 +328,18 @@ class CommandOSOperNews : public NewsBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, NEWS_HELP_OPER, Config->NewsCount); + u->SendMessage(OperServ, NEWS_HELP_OPER, Config->NewsCount); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "OPERNEWS", NEWS_OPER_SYNTAX); + SyntaxError(OperServ, u, "OPERNEWS", NEWS_OPER_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_OPERNEWS); + u->SendMessage(OperServ, OPER_HELP_CMD_OPERNEWS); } }; @@ -375,18 +357,18 @@ class CommandOSRandomNews : public NewsBase bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, NEWS_HELP_RANDOM); + u->SendMessage(OperServ, NEWS_HELP_RANDOM); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "RANDOMNEWS", NEWS_RANDOM_SYNTAX); + SyntaxError(OperServ, u, "RANDOMNEWS", NEWS_RANDOM_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_RANDOMNEWS); + u->SendMessage(OperServ, OPER_HELP_CMD_RANDOMNEWS); } }; diff --git a/modules/core/os_noop.cpp b/modules/core/os_noop.cpp index 33944f011..04bf0a7e4 100644 --- a/modules/core/os_noop.cpp +++ b/modules/core/os_noop.cpp @@ -35,7 +35,7 @@ class CommandOSNOOP : public Command reason = "NOOP command used by " + u->nick; if (Config->WallOSNoOp) ircdproto->SendGlobops(OperServ, "\2%s\2 used NOOP on \2%s\2", u->nick.c_str(), server.c_str()); - notice_lang(Config->s_OperServ, u, OPER_NOOP_SET, server.c_str()); + u->SendMessage(OperServ, OPER_NOOP_SET, server.c_str()); /* Kill all the IRCops of the server */ for (user_map::const_iterator it = UserListByNick.begin(), it_end = UserListByNick.end(); it != it_end; ) @@ -50,7 +50,7 @@ class CommandOSNOOP : public Command else if (cmd.equals_ci("REVOKE")) { ircdproto->SendSVSNOOP(server, 0); - notice_lang(Config->s_OperServ, u, OPER_NOOP_REVOKE, server.c_str()); + u->SendMessage(OperServ, OPER_NOOP_REVOKE, server.c_str()); } else this->OnSyntaxError(u, ""); @@ -59,18 +59,18 @@ class CommandOSNOOP : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_NOOP); + u->SendMessage(OperServ, OPER_HELP_NOOP); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "NOOP", OPER_NOOP_SYNTAX); + SyntaxError(OperServ, u, "NOOP", OPER_NOOP_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_NOOP); + u->SendMessage(OperServ, OPER_HELP_CMD_NOOP); } }; diff --git a/modules/core/os_oline.cpp b/modules/core/os_oline.cpp index 0404741c9..c7fd9b83d 100644 --- a/modules/core/os_oline.cpp +++ b/modules/core/os_oline.cpp @@ -28,19 +28,19 @@ class CommandOSOLine : public Command /* let's check whether the user is online */ if (!(u2 = finduser(nick))) - notice_lang(Config->s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(OperServ, NICK_X_NOT_IN_USE, nick.c_str()); else if (u2 && flag[0] == '+') { ircdproto->SendSVSO(Config->s_OperServ, nick, flag); u2->SetMode(OperServ, UMODE_OPER); - notice_lang(Config->s_OperServ, u2, OPER_OLINE_IRCOP); - notice_lang(Config->s_OperServ, u, OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str()); + u2->SendMessage(OperServ, OPER_OLINE_IRCOP); + u->SendMessage(OperServ, OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str()); ircdproto->SendGlobops(OperServ, "\2%s\2 used OLINE for %s", u->nick.c_str(), nick.c_str()); } else if (u2 && flag[0] == '-') { ircdproto->SendSVSO(Config->s_OperServ, nick, flag); - notice_lang(Config->s_OperServ, u, OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str()); + u->SendMessage(OperServ, OPER_OLINE_SUCCESS, flag.c_str(), nick.c_str()); ircdproto->SendGlobops(OperServ, "\2%s\2 used OLINE for %s", u->nick.c_str(), nick.c_str()); } else @@ -50,18 +50,18 @@ class CommandOSOLine : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_OLINE); + u->SendMessage(OperServ, OPER_HELP_OLINE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "OLINE", OPER_OLINE_SYNTAX); + SyntaxError(OperServ, u, "OLINE", OPER_OLINE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_OLINE); + u->SendMessage(OperServ, OPER_HELP_CMD_OLINE); } }; diff --git a/modules/core/os_quit.cpp b/modules/core/os_quit.cpp index 4eb184338..d133708a1 100644 --- a/modules/core/os_quit.cpp +++ b/modules/core/os_quit.cpp @@ -33,13 +33,13 @@ class CommandOSQuit : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_QUIT); + u->SendMessage(OperServ, OPER_HELP_QUIT); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_QUIT); + u->SendMessage(OperServ, OPER_HELP_CMD_QUIT); } }; diff --git a/modules/core/os_reload.cpp b/modules/core/os_reload.cpp index 21b719db9..a54e1c2ed 100644 --- a/modules/core/os_reload.cpp +++ b/modules/core/os_reload.cpp @@ -34,19 +34,19 @@ class CommandOSReload : public Command Log() << "Error reloading configuration file: " << ex.GetReason(); } - notice_lang(Config->s_OperServ, u, OPER_RELOAD); + u->SendMessage(OperServ, OPER_RELOAD); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_RELOAD); + u->SendMessage(OperServ, OPER_HELP_RELOAD); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_RELOAD); + u->SendMessage(OperServ, OPER_HELP_CMD_RELOAD); } }; diff --git a/modules/core/os_restart.cpp b/modules/core/os_restart.cpp index c1d8c35ff..62cfb0a37 100644 --- a/modules/core/os_restart.cpp +++ b/modules/core/os_restart.cpp @@ -33,13 +33,13 @@ class CommandOSRestart : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_RESTART); + u->SendMessage(OperServ, OPER_HELP_RESTART); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_RESTART); + u->SendMessage(OperServ, OPER_HELP_CMD_RESTART); } }; diff --git a/modules/core/os_session.cpp b/modules/core/os_session.cpp index 84619e9b3..e88e9a856 100644 --- a/modules/core/os_session.cpp +++ b/modules/core/os_session.cpp @@ -26,11 +26,11 @@ class ExceptionDelCallback : public NumberList ~ExceptionDelCallback() { if (!Deleted) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + u->SendMessage(OperServ, OPER_EXCEPTION_NO_MATCH); else if (Deleted == 1) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_DELETED_ONE); + u->SendMessage(OperServ, OPER_EXCEPTION_DELETED_ONE); else - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_DELETED_SEVERAL, Deleted); + u->SendMessage(OperServ, OPER_EXCEPTION_DELETED_SEVERAL, Deleted); } virtual void HandleNumber(unsigned Number) @@ -70,8 +70,8 @@ class ExceptionListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_COLHEAD); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_HEADER); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_COLHEAD); } DoList(u, Number - 1); @@ -82,7 +82,7 @@ class ExceptionListCallback : public NumberList if (index >= exceptions.size()) return; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_FORMAT, index + 1, exceptions[index]->limit, exceptions[index]->mask.c_str()); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_FORMAT, index + 1, exceptions[index]->limit, exceptions[index]->mask.c_str()); } }; @@ -101,7 +101,7 @@ class ExceptionViewCallback : public ExceptionListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_HEADER); } DoList(u, Number - 1); @@ -112,16 +112,9 @@ class ExceptionViewCallback : public ExceptionListCallback if (index >= exceptions.size()) return; - char timebuf[32]; - struct tm tm; - time_t t = Anope::CurTime; - - tm = *localtime(exceptions[index]->time ? &exceptions[index]->time : &t); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); - Anope::string expirebuf = expire_left(u->Account(), exceptions[index]->expires); - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_VIEW_FORMAT, index + 1, exceptions[index]->mask.c_str(), !exceptions[index]->who.empty() ? exceptions[index]->who.c_str() : "<unknown>", timebuf, expirebuf.c_str(), exceptions[index]->limit, exceptions[index]->reason.c_str()); + u->SendMessage(OperServ, OPER_EXCEPTION_VIEW_FORMAT, index + 1, exceptions[index]->mask.c_str(), !exceptions[index]->who.empty() ? exceptions[index]->who.c_str() : "<unknown>", do_strftime((exceptions[index]->time ? exceptions[index]->time : Anope::CurTime)).c_str(), expirebuf.c_str(), exceptions[index]->limit, exceptions[index]->reason.c_str()); } }; @@ -134,18 +127,18 @@ class CommandOSSession : public Command Anope::string param = params[1]; if ((mincount = (param.is_number_only() ? convertTo<int>(param) : 0)) <= 1) - notice_lang(Config->s_OperServ, u, OPER_SESSION_INVALID_THRESHOLD); + u->SendMessage(OperServ, OPER_SESSION_INVALID_THRESHOLD); else { - notice_lang(Config->s_OperServ, u, OPER_SESSION_LIST_HEADER, mincount); - notice_lang(Config->s_OperServ, u, OPER_SESSION_LIST_COLHEAD); + u->SendMessage(OperServ, OPER_SESSION_LIST_HEADER, mincount); + u->SendMessage(OperServ, OPER_SESSION_LIST_COLHEAD); for (session_map::const_iterator it = SessionList.begin(), it_end = SessionList.end(); it != it_end; ++it) { Session *session = it->second; if (session->count >= mincount) - notice_lang(Config->s_OperServ, u, OPER_SESSION_LIST_FORMAT, session->count, session->host.c_str()); + u->SendMessage(OperServ, OPER_SESSION_LIST_FORMAT, session->count, session->host.c_str()); } } @@ -158,11 +151,11 @@ class CommandOSSession : public Command Session *session = findsession(param); if (!session) - notice_lang(Config->s_OperServ, u, OPER_SESSION_NOT_FOUND, param.c_str()); + u->SendMessage(OperServ, OPER_SESSION_NOT_FOUND, param.c_str()); else { Exception *exception = find_host_exception(param); - notice_lang(Config->s_OperServ, u, OPER_SESSION_VIEW_FORMAT, param.c_str(), session->count, exception ? exception-> limit : Config->DefSessionLimit); + u->SendMessage(OperServ, OPER_SESSION_VIEW_FORMAT, param.c_str(), session->count, exception ? exception-> limit : Config->DefSessionLimit); } return MOD_CONT; @@ -178,7 +171,7 @@ class CommandOSSession : public Command if (!Config->LimitSessions) { - notice_lang(Config->s_OperServ, u, OPER_SESSION_DISABLED); + u->SendMessage(OperServ, OPER_EXCEPTION_DISABLED); return MOD_CONT; } @@ -193,18 +186,18 @@ class CommandOSSession : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SESSION); + u->SendMessage(OperServ, OPER_HELP_SESSION); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SESSION", OPER_SESSION_LIST_SYNTAX); + SyntaxError(OperServ, u, "SESSION", OPER_SESSION_LIST_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SESSION); + u->SendMessage(OperServ, OPER_HELP_CMD_SESSION); } }; @@ -245,7 +238,7 @@ class CommandOSException : public Command time_t expires = !expiry.empty() ? dotime(expiry) : Config->ExceptionExpiry; if (expires < 0) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -255,24 +248,24 @@ class CommandOSException : public Command if (limit < 0 || limit > static_cast<int>(Config->MaxSessionLimit)) { - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_INVALID_LIMIT, Config->MaxSessionLimit); + u->SendMessage(OperServ, OPER_EXCEPTION_INVALID_LIMIT, Config->MaxSessionLimit); return MOD_CONT; } else { if (mask.find('!') == Anope::string::npos || mask.find('@') == Anope::string::npos) { - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_INVALID_HOSTMASK); + u->SendMessage(OperServ, OPER_EXCEPTION_INVALID_HOSTMASK); return MOD_CONT; } x = exception_add(u, mask, limit, reason, u->nick, expires); if (x == 1) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_ADDED, mask.c_str(), limit); + u->SendMessage(OperServ, OPER_EXCEPTION_ADDED, mask.c_str(), limit); if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } return MOD_CONT; @@ -300,15 +293,15 @@ class CommandOSException : public Command if (mask.equals_ci(exceptions[i]->mask)) { ExceptionDelCallback::DoDel(u, i); - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_DELETED, mask.c_str()); + u->SendMessage(OperServ, OPER_EXCEPTION_DELETED, mask.c_str()); break; } if (i == end) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_NOT_FOUND, mask.c_str()); + u->SendMessage(OperServ, OPER_EXCEPTION_NOT_FOUND, mask.c_str()); } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } @@ -334,10 +327,10 @@ class CommandOSException : public Command exceptions[n1] = exceptions[n2]; exceptions[n2] = temp; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_MOVED, exceptions[n1]->mask.c_str(), n1 + 1, n2 + 1); + u->SendMessage(OperServ, OPER_EXCEPTION_MOVED, exceptions[n1]->mask.c_str(), n1 + 1, n2 + 1); if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } else this->OnSyntaxError(u, "MOVE"); @@ -365,15 +358,15 @@ class CommandOSException : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_COLHEAD); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_HEADER); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_COLHEAD); } ExceptionListCallback::DoList(u, i); } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + u->SendMessage(OperServ, OPER_EXCEPTION_NO_MATCH); } return MOD_CONT; @@ -399,14 +392,14 @@ class CommandOSException : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_LIST_HEADER); + u->SendMessage(OperServ, OPER_EXCEPTION_LIST_HEADER); } ExceptionViewCallback::DoList(u, i); } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_NO_MATCH); + u->SendMessage(OperServ, OPER_EXCEPTION_NO_MATCH); } return MOD_CONT; @@ -422,7 +415,7 @@ class CommandOSException : public Command if (!Config->LimitSessions) { - notice_lang(Config->s_OperServ, u, OPER_EXCEPTION_DISABLED); + u->SendMessage(OperServ, OPER_EXCEPTION_DISABLED); return MOD_CONT; } @@ -443,18 +436,18 @@ class CommandOSException : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_EXCEPTION); + u->SendMessage(OperServ, OPER_HELP_EXCEPTION); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "EXCEPTION", OPER_EXCEPTION_SYNTAX); + SyntaxError(OperServ, u, "EXCEPTION", OPER_EXCEPTION_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_EXCEPTION); + u->SendMessage(OperServ, OPER_HELP_CMD_EXCEPTION); } }; diff --git a/modules/core/os_set.cpp b/modules/core/os_set.cpp index f8790623f..db216b410 100644 --- a/modules/core/os_set.cpp +++ b/modules/core/os_set.cpp @@ -20,16 +20,16 @@ class CommandOSSet : public Command { Log(LOG_ADMIN, u, this); - int index; + LanguageString index; index = allow_ignore ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(Config->s_OperServ, u, index, "IGNORE"); + u->SendMessage(OperServ, index, "IGNORE"); index = readonly ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(Config->s_OperServ, u, index, "READONLY"); + u->SendMessage(OperServ, index, "READONLY"); index = debug ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(Config->s_OperServ, u, index, "DEBUG"); + u->SendMessage(OperServ, index, "DEBUG"); index = noexpire ? OPER_SET_LIST_OPTION_ON : OPER_SET_LIST_OPTION_OFF; - notice_lang(Config->s_OperServ, u, index, "NOEXPIRE"); + u->SendMessage(OperServ, index, "NOEXPIRE"); return MOD_CONT; } @@ -48,16 +48,16 @@ class CommandOSSet : public Command { Log(LOG_ADMIN, u, this) << "IGNORE ON"; allow_ignore = 1; - notice_lang(Config->s_OperServ, u, OPER_SET_IGNORE_ON); + u->SendMessage(OperServ, OPER_SET_IGNORE_ON); } else if (setting.equals_ci("OFF")) { Log(LOG_ADMIN, u, this) << "IGNORE OFF"; allow_ignore = 0; - notice_lang(Config->s_OperServ, u, OPER_SET_IGNORE_OFF); + u->SendMessage(OperServ, OPER_SET_IGNORE_OFF); } else - notice_lang(Config->s_OperServ, u, OPER_SET_IGNORE_ERROR); + u->SendMessage(OperServ, OPER_SET_IGNORE_ERROR); return MOD_CONT; } @@ -76,16 +76,16 @@ class CommandOSSet : public Command { readonly = true; Log(LOG_ADMIN, u, this) << "READONLY ON"; - notice_lang(Config->s_OperServ, u, OPER_SET_READONLY_ON); + u->SendMessage(OperServ, OPER_SET_READONLY_ON); } else if (setting.equals_ci("OFF")) { readonly = false; Log(LOG_ADMIN, u, this) << "READONLY OFF"; - notice_lang(Config->s_OperServ, u, OPER_SET_READONLY_OFF); + u->SendMessage(OperServ, OPER_SET_READONLY_OFF); } else - notice_lang(Config->s_OperServ, u, OPER_SET_READONLY_ERROR); + u->SendMessage(OperServ, OPER_SET_READONLY_ERROR); return MOD_CONT; } @@ -106,23 +106,23 @@ class CommandOSSet : public Command * Rob **/ if (!Config->SuperAdmin) - notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_NOT_ENABLED); + u->SendMessage(OperServ, OPER_SUPER_ADMIN_NOT_ENABLED); else if (setting.equals_ci("ON")) { u->isSuperAdmin = 1; - notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_ON); + u->SendMessage(OperServ, OPER_SUPER_ADMIN_ON); Log(LOG_ADMIN, u, this) << "SUPERADMIN ON"; - ircdproto->SendGlobops(OperServ, getstring(OPER_SUPER_ADMIN_WALL_ON), u->nick.c_str()); + ircdproto->SendGlobops(OperServ, GetString(OPER_SUPER_ADMIN_WALL_ON).c_str(), u->nick.c_str()); } else if (setting.equals_ci("OFF")) { u->isSuperAdmin = 0; - notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_OFF); + u->SendMessage(OperServ, OPER_SUPER_ADMIN_OFF); Log(LOG_ADMIN, u, this) << "SUPERADMIN OFF"; - ircdproto->SendGlobops(OperServ, getstring(OPER_SUPER_ADMIN_WALL_OFF), u->nick.c_str()); + ircdproto->SendGlobops(OperServ, GetString(OPER_SUPER_ADMIN_WALL_OFF).c_str(), u->nick.c_str()); } else - notice_lang(Config->s_OperServ, u, OPER_SUPER_ADMIN_SYNTAX); + u->SendMessage(OperServ, OPER_SUPER_ADMIN_SYNTAX); return MOD_CONT; } @@ -141,22 +141,22 @@ class CommandOSSet : public Command { debug = 1; Log(LOG_ADMIN, u, this) << "DEBUG ON"; - notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_ON); + u->SendMessage(OperServ, OPER_SET_DEBUG_ON); } else if (setting.equals_ci("OFF") || (setting[0] == '0' && setting.is_number_only() && !convertTo<int>(setting))) { Log(LOG_ADMIN, u, this) << "DEBUG OFF"; debug = 0; - notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_OFF); + u->SendMessage(OperServ, OPER_SET_DEBUG_OFF); } else if (setting.is_number_only() && convertTo<int>(setting) > 0) { debug = convertTo<int>(setting); Log(LOG_ADMIN, u, this) << "DEBUG " << debug; - notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_LEVEL, debug); + u->SendMessage(OperServ, OPER_SET_DEBUG_LEVEL, debug); } else - notice_lang(Config->s_OperServ, u, OPER_SET_DEBUG_ERROR); + u->SendMessage(OperServ, OPER_SET_DEBUG_ERROR); return MOD_CONT; } @@ -175,16 +175,16 @@ class CommandOSSet : public Command { noexpire = true; Log(LOG_ADMIN, u, this) << "NOEXPIRE ON"; - notice_lang(Config->s_OperServ, u, OPER_SET_NOEXPIRE_ON); + u->SendMessage(OperServ, OPER_SET_NOEXPIRE_ON); } else if (setting.equals_ci("OFF")) { noexpire = false; Log(LOG_ADMIN, u, this) << "NOEXPIRE OFF"; - notice_lang(Config->s_OperServ, u, OPER_SET_NOEXPIRE_OFF); + u->SendMessage(OperServ, OPER_SET_NOEXPIRE_OFF); } else - notice_lang(Config->s_OperServ, u, OPER_SET_NOEXPIRE_ERROR); + u->SendMessage(OperServ, OPER_SET_NOEXPIRE_ERROR); return MOD_CONT; } @@ -210,26 +210,26 @@ class CommandOSSet : public Command else if (option.equals_ci("NOEXPIRE")) return this->DoSetNoExpire(u, params); else - notice_lang(Config->s_OperServ, u, OPER_SET_UNKNOWN_OPTION, option.c_str()); + u->SendMessage(OperServ, OPER_SET_UNKNOWN_OPTION, option.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { if (subcommand.empty()) - notice_help(Config->s_OperServ, u, OPER_HELP_SET); + u->SendMessage(OperServ, OPER_HELP_SET); else if (subcommand.equals_ci("LIST")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_LIST); + u->SendMessage(OperServ, OPER_HELP_SET_LIST); else if (subcommand.equals_ci("READONLY")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_READONLY); + u->SendMessage(OperServ, OPER_HELP_SET_READONLY); else if (subcommand.equals_ci("DEBUG")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_DEBUG); + u->SendMessage(OperServ, OPER_HELP_SET_DEBUG); else if (subcommand.equals_ci("NOEXPIRE")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_NOEXPIRE); + u->SendMessage(OperServ, OPER_HELP_SET_NOEXPIRE); else if (subcommand.equals_ci("IGNORE")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_IGNORE); + u->SendMessage(OperServ, OPER_HELP_SET_IGNORE); else if (subcommand.equals_ci("SUPERADMIN")) - notice_help(Config->s_OperServ, u, OPER_HELP_SET_SUPERADMIN); + u->SendMessage(OperServ, OPER_HELP_SET_SUPERADMIN); else return false; @@ -238,12 +238,12 @@ class CommandOSSet : public Command void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SET", OPER_SET_SYNTAX); + SyntaxError(OperServ, u, "SET", OPER_SET_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SET); + u->SendMessage(OperServ, OPER_HELP_CMD_SET); } }; diff --git a/modules/core/os_shutdown.cpp b/modules/core/os_shutdown.cpp index 04e303b31..ab12a02eb 100644 --- a/modules/core/os_shutdown.cpp +++ b/modules/core/os_shutdown.cpp @@ -32,13 +32,13 @@ class CommandOSShutdown : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SHUTDOWN); + u->SendMessage(OperServ, OPER_HELP_SHUTDOWN); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SHUTDOWN); + u->SendMessage(OperServ, OPER_HELP_CMD_SHUTDOWN); } }; diff --git a/modules/core/os_snline.cpp b/modules/core/os_snline.cpp index 10c813dd9..d6a0d8844 100644 --- a/modules/core/os_snline.cpp +++ b/modules/core/os_snline.cpp @@ -26,11 +26,11 @@ class SNLineDelCallback : public NumberList ~SNLineDelCallback() { if (!Deleted) - notice_lang(Config->s_OperServ, u, OPER_SNLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SNLINE_NO_MATCH); else if (Deleted == 1) - notice_lang(Config->s_OperServ, u, OPER_SNLINE_DELETED_ONE); + u->SendMessage(OperServ, OPER_SNLINE_DELETED_ONE); else - notice_lang(Config->s_OperServ, u, OPER_SNLINE_DELETED_SEVERAL, Deleted); + u->SendMessage(OperServ, OPER_SNLINE_DELETED_SEVERAL, Deleted); } void HandleNumber(unsigned Number) @@ -63,7 +63,7 @@ class SNLineListCallback : public NumberList ~SNLineListCallback() { if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SNLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SNLINE_NO_MATCH); } virtual void HandleNumber(unsigned Number) @@ -76,7 +76,7 @@ class SNLineListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SNLINE_LIST_HEADER); } DoList(u, x, Number - 1); @@ -84,7 +84,7 @@ class SNLineListCallback : public NumberList static void DoList(User *u, XLine *x, unsigned Number) { - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); } }; @@ -105,7 +105,7 @@ class SNLineViewCallback : public SNLineListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SNLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SNLINE_VIEW_HEADER); } DoList(u, x, Number - 1); @@ -113,13 +113,8 @@ class SNLineViewCallback : public SNLineListCallback static void DoList(User *u, XLine *x, unsigned Number) { - char timebuf[32]; - struct tm tm; - - tm = *localtime(&x->Created); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); Anope::string expirebuf = expire_left(u->Account(), x->Expires); - notice_lang(Config->s_OperServ, u, OPER_SNLINE_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), timebuf, expirebuf.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str()); } }; @@ -149,7 +144,7 @@ class CommandOSSNLine : public Command /* Do not allow less than a minute expiry time */ if (expires && expires < 60) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -190,7 +185,7 @@ class CommandOSSNLine : public Command if (!x) return MOD_CONT; - notice_lang(Config->s_OperServ, u, OPER_SNLINE_ADDED, mask.c_str()); + u->SendMessage(OperServ, OPER_SNLINE_ADDED, mask.c_str()); if (Config->WallOSSNLine) { @@ -226,7 +221,7 @@ class CommandOSSNLine : public Command } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } else @@ -239,7 +234,7 @@ class CommandOSSNLine : public Command { if (SNLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SNLINE_LIST_EMPTY); return MOD_CONT; } @@ -262,18 +257,18 @@ class CommandOSSNLine : public Command if (!x) { - notice_lang(Config->s_OperServ, u, OPER_SNLINE_NOT_FOUND, mask.c_str()); + u->SendMessage(OperServ, OPER_SNLINE_NOT_FOUND, mask.c_str()); return MOD_CONT; } FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SNLINE)); SNLineDelCallback::DoDel(u, x); - notice_lang(Config->s_OperServ, u, OPER_SNLINE_DELETED, mask.c_str()); + u->SendMessage(OperServ, OPER_SNLINE_DELETED, mask.c_str()); } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } @@ -282,7 +277,7 @@ class CommandOSSNLine : public Command { if (SNLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SNLINE_LIST_EMPTY); return MOD_CONT; } @@ -306,7 +301,7 @@ class CommandOSSNLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SNLINE_LIST_HEADER); } SNLineListCallback::DoList(u, x, i); @@ -314,9 +309,9 @@ class CommandOSSNLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SNLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SNLINE_NO_MATCH); else - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "SNLine"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "SNLine"); } return MOD_CONT; @@ -326,7 +321,7 @@ class CommandOSSNLine : public Command { if (SNLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SNLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SNLINE_LIST_EMPTY); return MOD_CONT; } @@ -350,7 +345,7 @@ class CommandOSSNLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SNLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SNLINE_VIEW_HEADER); } SNLineViewCallback::DoList(u, x, i); @@ -358,7 +353,7 @@ class CommandOSSNLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SNLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SNLINE_NO_MATCH); } return MOD_CONT; @@ -368,7 +363,7 @@ class CommandOSSNLine : public Command { FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SNLINE)); SNLine->Clear(); - notice_lang(Config->s_OperServ, u, OPER_SNLINE_CLEAR); + u->SendMessage(OperServ, OPER_SNLINE_CLEAR); return MOD_CONT; } @@ -398,18 +393,18 @@ class CommandOSSNLine : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SNLINE); + u->SendMessage(OperServ, OPER_HELP_SNLINE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SNLINE", OPER_SNLINE_SYNTAX); + SyntaxError(OperServ, u, "SNLINE", OPER_SNLINE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SNLINE); + u->SendMessage(OperServ, OPER_HELP_CMD_SNLINE); } }; diff --git a/modules/core/os_sqline.cpp b/modules/core/os_sqline.cpp index 68a28347a..6ce51a518 100644 --- a/modules/core/os_sqline.cpp +++ b/modules/core/os_sqline.cpp @@ -25,11 +25,11 @@ class SQLineDelCallback : public NumberList ~SQLineDelCallback() { if (!Deleted) - notice_lang(Config->s_OperServ, u, OPER_SQLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SQLINE_NO_MATCH); else if (Deleted == 1) - notice_lang(Config->s_OperServ, u, OPER_SQLINE_DELETED_ONE); + u->SendMessage(OperServ, OPER_SQLINE_DELETED_ONE); else - notice_lang(Config->s_OperServ, u, OPER_SQLINE_DELETED_SEVERAL, Deleted); + u->SendMessage(OperServ, OPER_SQLINE_DELETED_SEVERAL, Deleted); } void HandleNumber(unsigned Number) @@ -62,7 +62,7 @@ class SQLineListCallback : public NumberList ~SQLineListCallback() { if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SQLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SQLINE_NO_MATCH); } virtual void HandleNumber(unsigned Number) @@ -75,7 +75,7 @@ class SQLineListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SQLINE_LIST_HEADER); } DoList(u, x, Number - 1); @@ -83,7 +83,7 @@ class SQLineListCallback : public NumberList static void DoList(User *u, XLine *x, unsigned Number) { - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); } }; @@ -104,7 +104,7 @@ class SQLineViewCallback : public SQLineListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SQLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SQLINE_VIEW_HEADER); } DoList(u, x, Number); @@ -112,13 +112,8 @@ class SQLineViewCallback : public SQLineListCallback static void DoList(User *u, XLine *x, unsigned Number) { - char timebuf[32]; - struct tm tm; - - tm = *localtime(&x->Created); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); Anope::string expirebuf = expire_left(u->Account(), x->Expires); - notice_lang(Config->s_OperServ, u, OPER_SQLINE_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), timebuf, expirebuf.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str()); } }; @@ -148,7 +143,7 @@ class CommandOSSQLine : public Command /* Do not allow less than a minute expiry time */ if (expires && expires < 60) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -170,7 +165,7 @@ class CommandOSSQLine : public Command if (!x) return MOD_CONT; - notice_lang(Config->s_OperServ, u, OPER_SQLINE_ADDED, mask.c_str()); + u->SendMessage(OperServ, OPER_SQLINE_ADDED, mask.c_str()); if (Config->WallOSSQLine) { @@ -206,7 +201,7 @@ class CommandOSSQLine : public Command } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } else @@ -219,7 +214,7 @@ class CommandOSSQLine : public Command { if (SQLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -242,18 +237,18 @@ class CommandOSSQLine : public Command if (!x) { - notice_lang(Config->s_OperServ, u, OPER_SQLINE_NOT_FOUND, mask.c_str()); + u->SendMessage(OperServ, OPER_SQLINE_NOT_FOUND, mask.c_str()); return MOD_CONT; } FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SQLINE)); SQLineDelCallback::DoDel(u, x); - notice_lang(Config->s_OperServ, u, OPER_SQLINE_DELETED, mask.c_str()); + u->SendMessage(OperServ, OPER_SQLINE_DELETED, mask.c_str()); } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } @@ -262,7 +257,7 @@ class CommandOSSQLine : public Command { if (SQLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -286,7 +281,7 @@ class CommandOSSQLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SQLINE_LIST_HEADER); } SQLineListCallback::DoList(u, x, i); @@ -294,9 +289,9 @@ class CommandOSSQLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SQLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SQLINE_NO_MATCH); else - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "SQLine"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "SQLine"); } return MOD_CONT; @@ -306,7 +301,7 @@ class CommandOSSQLine : public Command { if (SQLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SQLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SQLINE_LIST_EMPTY); return MOD_CONT; } @@ -330,7 +325,7 @@ class CommandOSSQLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SQLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SQLINE_VIEW_HEADER); } SQLineViewCallback::DoList(u, x, i); @@ -338,7 +333,7 @@ class CommandOSSQLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SQLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SQLINE_NO_MATCH); } return MOD_CONT; @@ -348,7 +343,7 @@ class CommandOSSQLine : public Command { FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SQLINE)); SGLine->Clear(); - notice_lang(Config->s_OperServ, u, OPER_SQLINE_CLEAR); + u->SendMessage(OperServ, OPER_SQLINE_CLEAR); return MOD_CONT; } @@ -378,18 +373,18 @@ class CommandOSSQLine : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SQLINE); + u->SendMessage(OperServ, OPER_HELP_SQLINE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX); + SyntaxError(OperServ, u, "SQLINE", OPER_SQLINE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SQLINE); + u->SendMessage(OperServ, OPER_HELP_CMD_SQLINE); } }; diff --git a/modules/core/os_staff.cpp b/modules/core/os_staff.cpp index c1d5b38ba..f5c80b3ad 100644 --- a/modules/core/os_staff.cpp +++ b/modules/core/os_staff.cpp @@ -22,7 +22,7 @@ class CommandOSStaff : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { - notice_lang(Config->s_OperServ, u, OPER_STAFF_LIST_HEADER); + u->SendMessage(OperServ, OPER_STAFF_LIST_HEADER); for (std::list<std::pair<Anope::string, Anope::string> >::iterator it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it) { @@ -41,29 +41,29 @@ class CommandOSStaff : public Command { found = 1; if (na->nick.equals_ci(u2->nick)) - notice_lang(Config->s_OperServ, u, OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str()); + u->SendMessage(OperServ, OPER_STAFF_FORMAT, '*', type.c_str(), u2->nick.c_str()); else - notice_lang(Config->s_OperServ, u, OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str()); + u->SendMessage(OperServ, OPER_STAFF_AFORMAT, '*', type.c_str(), na->nick.c_str(), u2->nick.c_str()); } } if (!found) - notice_lang(Config->s_OperServ, u, OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str()); + u->SendMessage(OperServ, OPER_STAFF_FORMAT, ' ', type.c_str(), na->nick.c_str()); } } - notice_lang(Config->s_OperServ, u, END_OF_ANY_LIST, "Staff"); + u->SendMessage(OperServ, END_OF_ANY_LIST, "Staff"); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_STAFF); + u->SendMessage(OperServ, OPER_HELP_STAFF); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_STAFF); + u->SendMessage(OperServ, OPER_HELP_CMD_STAFF); } }; diff --git a/modules/core/os_stats.cpp b/modules/core/os_stats.cpp index 332b6ba4f..295ec95f5 100644 --- a/modules/core/os_stats.cpp +++ b/modules/core/os_stats.cpp @@ -41,81 +41,81 @@ class CommandOSStats : public Command { int timeout; /* AKILLs */ - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_COUNT, SGLine->GetCount()); + u->SendMessage(OperServ, OPER_STATS_AKILL_COUNT, SGLine->GetCount()); timeout = Config->AutokillExpiry + 59; if (timeout >= 172800) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAYS, timeout / 86400); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_DAY); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOURS, timeout / 3600); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_HOUR); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MINS, timeout / 60); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_MIN); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_MIN); else - notice_lang(Config->s_OperServ, u, OPER_STATS_AKILL_EXPIRE_NONE); + u->SendMessage(OperServ, OPER_STATS_AKILL_EXPIRE_NONE); if (ircd->snline) { /* SNLINEs */ - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_COUNT, SNLine->GetCount()); + u->SendMessage(OperServ, OPER_STATS_SNLINE_COUNT, SNLine->GetCount()); timeout = Config->SNLineExpiry + 59; if (timeout >= 172800) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_DAYS, timeout / 86400); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_DAY); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_HOURS, timeout / 3600); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_HOUR); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_MINS, timeout / 60); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_MIN); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_MIN); else - notice_lang(Config->s_OperServ, u, OPER_STATS_SNLINE_EXPIRE_NONE); + u->SendMessage(OperServ, OPER_STATS_SNLINE_EXPIRE_NONE); } if (ircd->sqline) { /* SQLINEs */ - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_COUNT, SQLine->GetCount()); + u->SendMessage(OperServ, OPER_STATS_SQLINE_COUNT, SQLine->GetCount()); timeout = Config->SQLineExpiry + 59; if (timeout >= 172800) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAYS, timeout / 86400); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_DAY); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOURS, timeout / 3600); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_HOUR); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MINS, timeout / 60); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_MIN); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_MIN); else - notice_lang(Config->s_OperServ, u, OPER_STATS_SQLINE_EXPIRE_NONE); + u->SendMessage(OperServ, OPER_STATS_SQLINE_EXPIRE_NONE); } if (ircd->szline) { /* SZLINEs */ - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_COUNT, SZLine->GetCount()); + u->SendMessage(OperServ, OPER_STATS_SZLINE_COUNT, SZLine->GetCount()); timeout = Config->SZLineExpiry + 59; if (timeout >= 172800) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAYS, timeout / 86400); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_DAYS, timeout / 86400); else if (timeout >= 86400) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_DAY); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_DAY); else if (timeout >= 7200) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOURS, timeout / 3600); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_HOURS, timeout / 3600); else if (timeout >= 3600) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_HOUR); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_HOUR); else if (timeout >= 120) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MINS, timeout / 60); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_MINS, timeout / 60); else if (timeout >= 60) - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_MIN); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_MIN); else - notice_lang(Config->s_OperServ, u, OPER_STATS_SZLINE_EXPIRE_NONE); + u->SendMessage(OperServ, OPER_STATS_SZLINE_EXPIRE_NONE); } return MOD_CONT; } @@ -123,74 +123,51 @@ class CommandOSStats : public Command CommandReturn DoStatsReset(User *u) { maxusercnt = usercnt; - notice_lang(Config->s_OperServ, u, OPER_STATS_RESET); + u->SendMessage(OperServ, OPER_STATS_RESET); return MOD_CONT; } CommandReturn DoStatsUptime(User *u) { - char timebuf[64]; time_t uptime = Anope::CurTime - start_time; int days = uptime / 86400, hours = (uptime / 3600) % 24, mins = (uptime / 60) % 60, secs = uptime % 60; - notice_lang(Config->s_OperServ, u, OPER_STATS_CURRENT_USERS, usercnt, opcnt); - struct tm *tm = localtime(&maxusertime); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_DATE_TIME_FORMAT, tm); - notice_lang(Config->s_OperServ, u, OPER_STATS_MAX_USERS, maxusercnt, timebuf); + u->SendMessage(OperServ, OPER_STATS_CURRENT_USERS, usercnt, opcnt); + u->SendMessage(OperServ, OPER_STATS_MAX_USERS, maxusercnt, do_strftime(maxusertime).c_str()); if (days > 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_DHMS, days, hours, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_DHMS, days, hours, mins, secs); else if (days == 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1DHMS, days, hours, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_1DHMS, days, hours, mins, secs); else { if (hours > 1) { if (mins != 1) - { - if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_HMS, hours, mins, secs); - else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_HM1S, hours, mins, secs); - } + u->SendMessage(OperServ, OPER_STATS_UPTIME_HMS, hours, mins); else - { - if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_H1MS, hours, mins, secs); - else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_H1M1S, hours, mins, secs); - } + u->SendMessage(OperServ, OPER_STATS_UPTIME_H1MS, hours, mins, secs); } else if (hours == 1) { if (mins != 1) - { - if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1HMS, hours, mins, secs); - else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1HM1S, hours, mins, secs); - } + u->SendMessage(OperServ, OPER_STATS_UPTIME_1HMS, hours, mins, secs); else - { - if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1H1MS, hours, mins, secs); - else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1H1M1S, hours, mins, secs); - } + u->SendMessage(OperServ, OPER_STATS_UPTIME_1H1MS, hours, mins, secs); } else { if (mins != 1) { if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_MS, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_MS, mins, secs); else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_M1S, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_M1S, mins, secs); } else { if (secs != 1) - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1MS, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_1MS, mins, secs); else - notice_lang(Config->s_OperServ, u, OPER_STATS_UPTIME_1M1S, mins, secs); + u->SendMessage(OperServ, OPER_STATS_UPTIME_1M1S, mins, secs); } } } @@ -209,9 +186,9 @@ class CommandOSStats : public Command if (!buf.empty()) buf.erase(buf.begin()); - notice_lang(Config->s_OperServ, u, OPER_STATS_UPLINK_SERVER, Me->GetLinks().front()->GetName().c_str()); - notice_lang(Config->s_OperServ, u, OPER_STATS_UPLINK_CAPAB, buf.c_str()); - notice_lang(Config->s_OperServ, u, OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(Me->GetLinks().front())); + u->SendMessage(OperServ, OPER_STATS_UPLINK_SERVER, Me->GetLinks().front()->GetName().c_str()); + u->SendMessage(OperServ, OPER_STATS_UPLINK_CAPAB, buf.c_str()); + u->SendMessage(OperServ, OPER_STATS_UPLINK_SERVER_COUNT, stats_count_servers(Me->GetLinks().front())); return MOD_CONT; } @@ -219,33 +196,33 @@ class CommandOSStats : public Command { long count, mem; - notice_lang(Config->s_OperServ, u, OPER_STATS_BYTES_READ, TotalRead / 1024); - notice_lang(Config->s_OperServ, u, OPER_STATS_BYTES_WRITTEN, TotalWritten / 1024); + u->SendMessage(OperServ, OPER_STATS_BYTES_READ, TotalRead / 1024); + u->SendMessage(OperServ, OPER_STATS_BYTES_WRITTEN, TotalWritten / 1024); get_user_stats(count, mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_USER_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_USER_MEM, count, (mem + 512) / 1024); get_channel_stats(&count, &mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_CHANNEL_MEM, count, (mem + 512) / 1024); get_core_stats(count, mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_GROUPS_MEM, count, (mem + 512) / 1024); get_aliases_stats(count, mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_ALIASES_MEM, count, (mem + 512) / 1024); get_chanserv_stats(&count, &mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_CHANSERV_MEM, count, (mem + 512) / 1024); if (!Config->s_BotServ.empty()) { get_botserv_stats(&count, &mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_BOTSERV_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_BOTSERV_MEM, count, (mem + 512) / 1024); } if (!Config->s_HostServ.empty()) { get_hostserv_stats(&count, &mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_HOSTSERV_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_HOSTSERV_MEM, count, (mem + 512) / 1024); } get_operserv_stats(&count, &mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_OPERSERV_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_OPERSERV_MEM, count, (mem + 512) / 1024); get_session_stats(count, mem); - notice_lang(Config->s_OperServ, u, OPER_STATS_SESSIONS_MEM, count, (mem + 512) / 1024); + u->SendMessage(OperServ, OPER_STATS_SESSIONS_MEM, count, (mem + 512) / 1024); return MOD_CONT; } @@ -265,7 +242,7 @@ class CommandOSStats : public Command else if (extra.equals_ci("RESET")) return this->DoStatsReset(u); else if (!extra.equals_ci("MEMORY") && !extra.equals_ci("UPLINK")) - notice_lang(Config->s_OperServ, u, OPER_STATS_UNKNOWN_OPTION, extra.c_str()); + u->SendMessage(OperServ, OPER_STATS_UNKNOWN_OPTION, extra.c_str()); } if (extra.empty() || (!extra.equals_ci("MEMORY") && !extra.equals_ci("UPLINK"))) @@ -282,13 +259,13 @@ class CommandOSStats : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_STATS); + u->SendMessage(OperServ, OPER_HELP_STATS); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_STATS); + u->SendMessage(OperServ, OPER_HELP_CMD_STATS); } }; diff --git a/modules/core/os_svsnick.cpp b/modules/core/os_svsnick.cpp index 537b32b6a..cc50f83b3 100644 --- a/modules/core/os_svsnick.cpp +++ b/modules/core/os_svsnick.cpp @@ -31,33 +31,33 @@ class CommandOSSVSNick : public Command /* Truncate long nicknames to NICKMAX-2 characters */ if (newnick.length() > Config->NickLen) { - notice_lang(Config->s_OperServ, u, NICK_X_TRUNCATED, newnick.c_str(), Config->NickLen, newnick.c_str()); + u->SendMessage(OperServ, NICK_X_TRUNCATED, newnick.c_str(), Config->NickLen, newnick.c_str()); newnick = params[1].substr(0, Config->NickLen); } /* Check for valid characters */ if (newnick[0] == '-' || isdigit(newnick[0])) { - notice_lang(Config->s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); + u->SendMessage(OperServ, NICK_X_ILLEGAL, newnick.c_str()); return MOD_CONT; } for (unsigned i = 0, end = newnick.length(); i < end; ++i) if (!isvalidnick(newnick[i])) { - notice_lang(Config->s_OperServ, u, NICK_X_ILLEGAL, newnick.c_str()); + u->SendMessage(OperServ, NICK_X_ILLEGAL, newnick.c_str()); return MOD_CONT; } /* Check for a nick in use or a forbidden/suspended nick */ if (!(u2 = finduser(nick))) - notice_lang(Config->s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(OperServ, NICK_X_NOT_IN_USE, nick.c_str()); else if (finduser(newnick)) - notice_lang(Config->s_OperServ, u, NICK_X_IN_USE, newnick.c_str()); + u->SendMessage(OperServ, NICK_X_IN_USE, newnick.c_str()); else if ((na = findnick(newnick)) && na->HasFlag(NS_FORBIDDEN)) - notice_lang(Config->s_OperServ, u, NICK_X_FORBIDDEN, newnick.c_str()); + u->SendMessage(OperServ, NICK_X_FORBIDDEN, newnick.c_str()); else { - notice_lang(Config->s_OperServ, u, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str()); + u->SendMessage(OperServ, OPER_SVSNICK_NEWNICK, nick.c_str(), newnick.c_str()); ircdproto->SendGlobops(OperServ, "%s used SVSNICK to change %s to %s", u->nick.c_str(), nick.c_str(), newnick.c_str()); ircdproto->SendForceNickChange(u2, newnick, Anope::CurTime); } @@ -66,18 +66,18 @@ class CommandOSSVSNick : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SVSNICK); + u->SendMessage(OperServ, OPER_HELP_SVSNICK); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX); + SyntaxError(OperServ, u, "SVSNICK", OPER_SVSNICK_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SVSNICK); + u->SendMessage(OperServ, OPER_HELP_CMD_SVSNICK); } }; diff --git a/modules/core/os_szline.cpp b/modules/core/os_szline.cpp index 0d024282a..caea0424b 100644 --- a/modules/core/os_szline.cpp +++ b/modules/core/os_szline.cpp @@ -25,11 +25,11 @@ class SZLineDelCallback : public NumberList ~SZLineDelCallback() { if (!Deleted) - notice_lang(Config->s_OperServ, u, OPER_SZLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SZLINE_NO_MATCH); else if (Deleted == 1) - notice_lang(Config->s_OperServ, u, OPER_SZLINE_DELETED_ONE); + u->SendMessage(OperServ, OPER_SZLINE_DELETED_ONE); else - notice_lang(Config->s_OperServ, u, OPER_SZLINE_DELETED_SEVERAL, Deleted); + u->SendMessage(OperServ, OPER_SZLINE_DELETED_SEVERAL, Deleted); } void HandleNumber(unsigned Number) @@ -62,7 +62,7 @@ class SZLineListCallback : public NumberList ~SZLineListCallback() { if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SZLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SZLINE_NO_MATCH); } virtual void HandleNumber(unsigned Number) @@ -75,7 +75,7 @@ class SZLineListCallback : public NumberList if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SZLINE_LIST_HEADER); } DoList(u, x, Number - 1); @@ -83,7 +83,7 @@ class SZLineListCallback : public NumberList static void DoList(User *u, XLine *x, unsigned Number) { - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_LIST_FORMAT, Number + 1, x->Mask.c_str(), x->Reason.c_str()); } }; @@ -104,7 +104,7 @@ class SZLineViewCallback : public SZLineListCallback if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SZLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SZLINE_VIEW_HEADER); } DoList(u, x, Number - 1); @@ -112,13 +112,8 @@ class SZLineViewCallback : public SZLineListCallback static void DoList(User *u, XLine *x, unsigned Number) { - char timebuf[32]; - struct tm tm; - - tm = *localtime(&x->Created); - strftime_lang(timebuf, sizeof(timebuf), u, STRFTIME_SHORT_DATE_FORMAT, &tm); Anope::string expirebuf = expire_left(u->Account(), x->Expires); - notice_lang(Config->s_OperServ, u, OPER_SZLINE_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), timebuf, expirebuf.c_str(), x->Reason.c_str()); + u->SendMessage(OperServ, OPER_VIEW_FORMAT, Number + 1, x->Mask.c_str(), x->By.c_str(), do_strftime(x->Created).c_str(), expirebuf.c_str(), x->Reason.c_str()); } }; @@ -148,7 +143,7 @@ class CommandOSSZLine : public Command /* Do not allow less than a minute expiry time */ if (expires && expires < 60) { - notice_lang(Config->s_OperServ, u, BAD_EXPIRY_TIME); + u->SendMessage(OperServ, BAD_EXPIRY_TIME); return MOD_CONT; } else if (expires > 0) @@ -170,7 +165,7 @@ class CommandOSSZLine : public Command if (!x) return MOD_CONT; - notice_lang(Config->s_OperServ, u, OPER_SZLINE_ADDED, mask.c_str()); + u->SendMessage(OperServ, OPER_SZLINE_ADDED, mask.c_str()); if (Config->WallOSSZLine) { @@ -206,7 +201,7 @@ class CommandOSSZLine : public Command } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); } else @@ -219,7 +214,7 @@ class CommandOSSZLine : public Command { if (SZLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -242,18 +237,18 @@ class CommandOSSZLine : public Command if (!x) { - notice_lang(Config->s_OperServ, u, OPER_SZLINE_NOT_FOUND, mask.c_str()); + u->SendMessage(OperServ, OPER_SZLINE_NOT_FOUND, mask.c_str()); return MOD_CONT; } FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, x, X_SZLINE)); SZLineDelCallback::DoDel(u, x); - notice_lang(Config->s_OperServ, u, OPER_SZLINE_DELETED, mask.c_str()); + u->SendMessage(OperServ, OPER_SZLINE_DELETED, mask.c_str()); } if (readonly) - notice_lang(Config->s_OperServ, u, READ_ONLY_MODE); + u->SendMessage(OperServ, READ_ONLY_MODE); return MOD_CONT; } @@ -262,7 +257,7 @@ class CommandOSSZLine : public Command { if (SZLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -286,7 +281,7 @@ class CommandOSSZLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_HEADER); + u->SendMessage(OperServ, OPER_SZLINE_LIST_HEADER); } SZLineListCallback::DoList(u, x, i); @@ -294,7 +289,7 @@ class CommandOSSZLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SZLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SZLINE_NO_MATCH); } return MOD_CONT; @@ -304,7 +299,7 @@ class CommandOSSZLine : public Command { if (SZLine->GetList().empty()) { - notice_lang(Config->s_OperServ, u, OPER_SZLINE_LIST_EMPTY); + u->SendMessage(OperServ, OPER_SZLINE_LIST_EMPTY); return MOD_CONT; } @@ -328,7 +323,7 @@ class CommandOSSZLine : public Command if (!SentHeader) { SentHeader = true; - notice_lang(Config->s_OperServ, u, OPER_SZLINE_VIEW_HEADER); + u->SendMessage(OperServ, OPER_SZLINE_VIEW_HEADER); } SZLineViewCallback::DoList(u, x, i); @@ -336,7 +331,7 @@ class CommandOSSZLine : public Command } if (!SentHeader) - notice_lang(Config->s_OperServ, u, OPER_SZLINE_NO_MATCH); + u->SendMessage(OperServ, OPER_SZLINE_NO_MATCH); } return MOD_CONT; @@ -346,7 +341,7 @@ class CommandOSSZLine : public Command { FOREACH_MOD(I_OnDelXLine, OnDelXLine(u, NULL, X_SZLINE)); SZLine->Clear(); - notice_lang(Config->s_OperServ, u, OPER_SZLINE_CLEAR); + u->SendMessage(OperServ, OPER_SZLINE_CLEAR); return MOD_CONT; } @@ -376,18 +371,18 @@ class CommandOSSZLine : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SZLINE); + u->SendMessage(OperServ, OPER_HELP_SZLINE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX); + SyntaxError(OperServ, u, "SZLINE", OPER_SZLINE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SZLINE); + u->SendMessage(OperServ, OPER_HELP_CMD_SZLINE); } }; diff --git a/modules/core/os_umode.cpp b/modules/core/os_umode.cpp index d80637d49..a2834edae 100644 --- a/modules/core/os_umode.cpp +++ b/modules/core/os_umode.cpp @@ -37,13 +37,13 @@ class CommandOSUMode : public Command return MOD_CONT; } if (!(u2 = finduser(nick))) - notice_lang(Config->s_OperServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(OperServ, NICK_X_NOT_IN_USE, nick.c_str()); else { u2->SetModes(OperServ, "%s", modes.c_str()); - notice_lang(Config->s_OperServ, u, OPER_UMODE_SUCCESS, nick.c_str()); - notice_lang(Config->s_OperServ, u2, OPER_UMODE_CHANGED, u->nick.c_str()); + u->SendMessage(OperServ, OPER_UMODE_SUCCESS, nick.c_str()); + u2->SendMessage(OperServ, OPER_UMODE_CHANGED, u->nick.c_str()); if (Config->WallOSMode) ircdproto->SendGlobops(OperServ, "\2%s\2 used UMODE on %s", u->nick.c_str(), nick.c_str()); @@ -53,18 +53,18 @@ class CommandOSUMode : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_UMODE); + u->SendMessage(OperServ, OPER_HELP_UMODE); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - syntax_error(Config->s_OperServ, u, "UMODE", OPER_UMODE_SYNTAX); + SyntaxError(OperServ, u, "UMODE", OPER_UMODE_SYNTAX); } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_UMODE); + u->SendMessage(OperServ, OPER_HELP_CMD_UMODE); } }; diff --git a/modules/core/os_update.cpp b/modules/core/os_update.cpp index ad632f277..6a96ab855 100644 --- a/modules/core/os_update.cpp +++ b/modules/core/os_update.cpp @@ -22,20 +22,20 @@ class CommandOSUpdate : public Command CommandReturn Execute(User *u, const std::vector<Anope::string> ¶ms) { - notice_lang(Config->s_OperServ, u, OPER_UPDATING); + u->SendMessage(OperServ, OPER_UPDATING); save_data = true; return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_UPDATE); + u->SendMessage(OperServ, OPER_HELP_UPDATE); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_UPDATE); + u->SendMessage(OperServ, OPER_HELP_CMD_UPDATE); } }; diff --git a/modules/core/os_userlist.cpp b/modules/core/os_userlist.cpp index f7579fc32..4c3355006 100644 --- a/modules/core/os_userlist.cpp +++ b/modules/core/os_userlist.cpp @@ -32,7 +32,7 @@ class CommandOSUserList : public Command if (!pattern.empty() && (c = findchan(pattern))) { - notice_lang(Config->s_OperServ, u, OPER_USERLIST_HEADER_CHAN, pattern.c_str()); + u->SendMessage(OperServ, OPER_USERLIST_HEADER_CHAN, pattern.c_str()); for (CUserList::iterator cuit = c->users.begin(), cuit_end = c->users.end(); cuit != cuit_end; ++cuit) { @@ -43,12 +43,12 @@ class CommandOSUserList : public Command if (!uc->user->HasMode(*it)) continue; - notice_lang(Config->s_OperServ, u, OPER_USERLIST_RECORD, uc->user->nick.c_str(), uc->user->GetIdent().c_str(), uc->user->GetDisplayedHost().c_str()); + u->SendMessage(OperServ, OPER_USERLIST_RECORD, uc->user->nick.c_str(), uc->user->GetIdent().c_str(), uc->user->GetDisplayedHost().c_str()); } } else { - notice_lang(Config->s_OperServ, u, OPER_USERLIST_HEADER); + u->SendMessage(OperServ, OPER_USERLIST_HEADER); for (user_map::const_iterator uit = UserListByNick.begin(), uit_end = UserListByNick.end(); uit != uit_end; ++uit) { @@ -64,23 +64,23 @@ class CommandOSUserList : public Command if (!u2->HasMode(*it)) continue; } - notice_lang(Config->s_OperServ, u, OPER_USERLIST_RECORD, u2->nick.c_str(), u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str()); + u->SendMessage(OperServ, OPER_USERLIST_RECORD, u2->nick.c_str(), u2->GetIdent().c_str(), u2->GetDisplayedHost().c_str()); } } - notice_lang(Config->s_OperServ, u, OPER_USERLIST_END); + u->SendMessage(OperServ, OPER_USERLIST_END); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_USERLIST); + u->SendMessage(OperServ, OPER_HELP_USERLIST); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_USERLIST); + u->SendMessage(OperServ, OPER_HELP_CMD_USERLIST); } }; diff --git a/modules/extra/cs_appendtopic.cpp b/modules/extra/cs_appendtopic.cpp index 09ab3b481..e8ccde22b 100644 --- a/modules/extra/cs_appendtopic.cpp +++ b/modules/extra/cs_appendtopic.cpp @@ -41,14 +41,6 @@ /* DO NOT EDIT BELOW THIS LINE UNLESS YOU KNOW WHAT YOU ARE DOING */ /* ---------------------------------------------------------------------- */ -enum -{ - LNG_CHAN_HELP, - LNG_CHAN_HELP_APPENDTOPIC, - LNG_APPENDTOPIC_SYNTAX, - LNG_NUM_STRINGS -}; - static Module *me; class CommandCSAppendTopic : public Command @@ -66,9 +58,9 @@ class CommandCSAppendTopic : public Command Channel *c = ci ? ci->c : NULL; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (!check_access(u, ci, CA_TOPIC)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { Anope::string topic; @@ -94,21 +86,23 @@ class CommandCSAppendTopic : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + me->SendMessage(ChanServ, u, _("Syntax: APPENDTOPIC channel text")); u->SendMessage(Config->s_ChanServ, " "); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_APPENDTOPIC); + me->SendMessage(ChanServ, u, _("This command allows users to append text to a currently set\n" + "channel topic. When TOPICLOCK is on, the topic is updated and\n" + "the new, updated topic is locked.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_ChanServ, u, LNG_APPENDTOPIC_SYNTAX); + me->SendMessage(ChanServ, u, _("Syntax: APPENDTOPIC channel text")); } void OnServHelp(User *u) { - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP); + me->SendMessage(ChanServ, u, _(" APPENDTOPIC Add text to a channels topic")); } }; @@ -125,86 +119,6 @@ class CSAppendTopic : public Module this->SetType(SUPPORTED); this->AddCommand(ChanServ, &commandcsappendtopic); - - /* English (US) */ - const char *langtable_en_us[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Add text to a channels topic", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "This command allows users to append text to a currently set\n" - "channel topic. When TOPICLOCK is on, the topic is updated and\n" - "the new, updated topic is locked.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Syntax: APPENDTOPIC channel text\n" - }; - - /* Dutch (NL) */ - const char *langtable_nl[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Voeg tekst aan een kanaal onderwerp toe", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Dit command stelt gebruikers in staat om text toe te voegen\n" - "achter het huidige onderwerp van een kanaal. Als TOPICLOCK aan\n" - "staat, zal het onderwerp worden bijgewerkt en zal het nieuwe,\n" - "bijgewerkte topic worden geforceerd.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Gebruik: APPENDTOPIC kanaal tekst\n" - }; - - /* German (DE) */ - const char *langtable_de[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Fьgt einen Text zu einem Channel-Topic hinzu.", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Dieser Befehl erlaubt Benutzern, einen Text zu dem vorhandenen Channel-Topic\n" - "hinzuzufьgen. Wenn TOPICLOCK gesetzt ist, wird das Topic aktualisiert\n" - "und das neue, aktualisierte Topic wird gesperrt.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Syntax: APPENDTOPIC Channel Text\n" - }; - - /* Portuguese (PT) */ - const char *langtable_pt[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Adiciona texto ao tуpico de um canal", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Este comando permite aos usuбrios anexar texto a um tуpico de canal\n" - "jб definido. Quando TOPICLOCK estб ativado, o tуpico й atualizado e\n" - "o novo tуpico й travado.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Sintaxe: APPENDTOPIC canal texto \n" - }; - - /* Russian (RU) */ - const char *langtable_ru[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Добавляет текст к топику канала", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Данная команда позволяет добавить текст к топику, который установлен на указанном\n" - "канале. Если активирован режим TOPICLOCK, топик будет обновлен и заблокирован.\n" - "Примечание: текст будет ДОБАВЛЕН к топику, то есть старый топик удален НЕ БУДЕТ.\n", - /* LNG_APPENDTOPIC_SYNTAX */ - "Синтаксис: APPENDTOPIC #канал текст\n" - }; - - /* Italian (IT) */ - const char *langtable_it[] = { - /* LNG_CHAN_HELP */ - " APPENDTOPIC Aggiunge del testo al topic di un canale", - /* LNG_CHAN_HELP_APPENDTOPIC */ - "Questo comando permette agli utenti di aggiungere del testo ad un topic di un canale\n" - "giа impostato. Se TOPICLOCK и attivato, il topic viene aggiornato e il nuovo topic\n" - "viene bloccato.", - /* LNG_APPENDTOPIC_SYNTAX */ - "Sintassi: APPENDTOPIC canale testo\n" - }; - - this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); - this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl); - this->InsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de); - this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt); - this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru); - this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it); } }; diff --git a/modules/extra/cs_enforce.cpp b/modules/extra/cs_enforce.cpp index 5541aa5ca..2d65422c6 100644 --- a/modules/extra/cs_enforce.cpp +++ b/modules/extra/cs_enforce.cpp @@ -15,19 +15,6 @@ #include "module.h" -#define AUTHOR "Anope" - -enum -{ - LNG_CHAN_HELP, - LNG_ENFORCE_SYNTAX, - LNG_CHAN_HELP_ENFORCE, - LNG_CHAN_HELP_ENFORCE_R_ENABLED, - LNG_CHAN_HELP_ENFORCE_R_DISABLED, - LNG_CHAN_RESPONSE, - LNG_NUM_STRINGS -}; - static Module *me; class CommandCSEnforce : public Command @@ -87,7 +74,6 @@ class CommandCSEnforce : public Command ChannelInfo *ci; int16 old_nojoin_level; Anope::string mask; - const char *reason; if (!(ci = c->ci)) return; @@ -103,9 +89,9 @@ class CommandCSEnforce : public Command if (check_access(uc->user, ci, CA_NOJOIN)) { get_idealban(ci, uc->user, mask); - reason = getstring(uc->user, CHAN_NOT_ALLOWED_TO_JOIN); + Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN); c->SetMode(NULL, CMODE_BAN, mask); - c->Kick(NULL, uc->user, "%s", reason); + c->Kick(NULL, uc->user, "%s", reason.c_str()); } } @@ -127,7 +113,7 @@ class CommandCSEnforce : public Command if (!uc->user->IsIdentified()) { get_idealban(ci, uc->user, mask); - Anope::string reason = getstring(uc->user, CHAN_NOT_ALLOWED_TO_JOIN); + Anope::string reason = GetString(uc->user, CHAN_NOT_ALLOWED_TO_JOIN); if (!c->HasMode(CMODE_REGISTERED)) c->SetMode(NULL, CMODE_BAN, mask); c->Kick(NULL, uc->user, "%s", reason.c_str()); @@ -150,35 +136,35 @@ class CommandCSEnforce : public Command ci = c->ci; if (!c) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (!check_access(u, ci, CA_AKICK)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); + u->SendMessage(ChanServ, ACCESS_DENIED); else { if (what.empty() || what.equals_ci("SET")) { this->DoSet(c); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, !what.empty() ? what.c_str() : "SET"); + me->SendMessage(ChanServ, u, _("Enforced %s"), !what.empty() ? what.c_str() : "SET"); } else if (what.equals_ci("MODES")) { this->DoModes(c); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str()); } else if (what.equals_ci("SECUREOPS")) { this->DoSecureOps(c); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str()); } else if (what.equals_ci("RESTRICTED")) { this->DoRestricted(c); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str()); } else if (what.equals_ci("+R")) { this->DoCModeR(c); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_RESPONSE, what.c_str()); + me->SendMessage(ChanServ, u, _("Enforced %s"), what.c_str()); } else this->OnSyntaxError(u, ""); @@ -189,26 +175,44 @@ class CommandCSEnforce : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_ChanServ, u, LNG_ENFORCE_SYNTAX); - u->SendMessage(Config->s_ChanServ, " "); - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE); - u->SendMessage(Config->s_ChanServ, " "); + me->SendMessage(ChanServ, u, _("Syntax: \002ENFORCE \037channel\037 [\037what\037]\002")); + me->SendMessage(ChanServ, u, " "); + me->SendMessage(ChanServ, u, _("Enforce various channel modes and set options. The \037channel\037\n" + "option indicates what channel to enforce the modes and options\n" + "on. The \037what\037 option indicates what modes and options to\n" + "enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n" + "or +R. When left out, it defaults to SET.\n" + " \n" + "If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n" + "on the users currently in the channel, if they are set. Give\n" + "SECUREOPS to enforce the SECUREOPS option, even if it is not\n" + "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n" + "if it's not enabled.")); + me->SendMessage(ChanServ, u, " "); if (ModeManager::FindChannelModeByName(CMODE_REGISTERED)) - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_ENABLED); + me->SendMessage(ChanServ, u, _("If \037what\037 is MODES, it will enforce channelmode +R if it is\n" + "set. If +R is specified for \037what\037, the +R channelmode will\n" + "also be enforced, but even if it is not set. If it is not set,\n" + "users will be banned to ensure they don't just rejoin.")); else - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP_ENFORCE_R_DISABLED); + me->SendMessage(ChanServ, u, _("If \037what\037 is MODES, nothing will be enforced, since it would\n" + "enforce modes that the current ircd does not support. If +R is\n" + "specified for \037what\037, an equalivant of channelmode +R on\n" + "other ircds will be enforced. All users that are in the channel\n" + "but have not identified for their nickname will be kicked and\n" + "banned from the channel.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_ChanServ, u, LNG_ENFORCE_SYNTAX); + me->SendMessage(ChanServ, u, _("Syntax: \002ENFORCE \037channel\037 [\037what\037]\002")); } void OnServHelp(User *u) { - me->NoticeLang(Config->s_ChanServ, u, LNG_CHAN_HELP); + me->SendMessage(ChanServ, u, _(" ENFORCE Enforce various channel modes and set options")); } }; @@ -221,218 +225,10 @@ class CSEnforce : public Module { me = this; - this->SetAuthor(AUTHOR); + this->SetAuthor("Anope"); this->SetType(SUPPORTED); this->AddCommand(ChanServ, &commandcsenforce); - - /* English (US) */ - const char *langtable_en_us[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Enforce various channel modes and set options", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037channel\037 [\037what\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Enforce various channel modes and set options. The \037channel\037\n" - "option indicates what channel to enforce the modes and options\n" - "on. The \037what\037 option indicates what modes and options to\n" - "enforce, and can be any of SET, SECUREOPS, RESTRICTED, MODES,\n" - "or +R. When left out, it defaults to SET.\n" - " \n" - "If \037what\037 is SET, it will enforce SECUREOPS and RESTRICTED\n" - "on the users currently in the channel, if they are set. Give\n" - "SECUREOPS to enforce the SECUREOPS option, even if it is not\n" - "enabled. Use RESTRICTED to enfore the RESTRICTED option, also\n" - "if it's not enabled.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "If \037what\037 is MODES, it will enforce channelmode +R if it is\n" - "set. If +R is specified for \037what\037, the +R channelmode will\n" - "also be enforced, but even if it is not set. If it is not set,\n" - "users will be banned to ensure they don't just rejoin.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "If \037what\037 is MODES, nothing will be enforced, since it would\n" - "enforce modes that the current ircd does not support. If +R is\n" - "specified for \037what\037, an equalivant of channelmode +R on\n" - "other ircds will be enforced. All users that are in the channel\n" - "but have not identified for their nickname will be kicked and\n" - "banned from the channel.", - /* LNG_CHAN_RESPONSE */ - "Enforced %s" - }; - - /* Dutch (NL) */ - const char *langtable_nl[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Forceer enkele kanaalmodes en set-opties", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037kanaal\037 [\037wat\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Forceer enkele kannalmodes en set-opties. De \037kanaal\037 optie\n" - "geeft aan op welk kanaal de modes en opties geforceerd moeten\n" - "worden. De \037wat\037 optie geeft aan welke modes en opties\n" - "geforceerd moeten worden; dit kan SET, SECUREOPS, RESTRICTED,\n" - "MODES, of +R zijn. Indien weggelaten is dit standaard SET.\n" - " \n" - "Als er voor \037wat\037 SET wordt ingevuld, zullen SECUREOPS en\n" - "RESTRICTED geforceerd worden op de gebruikers in het kanaal,\n" - "maar alleen als die opties aangezet zijn voor het kanaal. Als\n" - "SECUREOPS of RESTRICTED wordt gegeven voor \037wat\037 zal die optie\n" - "altijd geforceerd worden, ook als die niet is aangezet.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Als er voor \037wat\037 MODES wordt ingevuld, zal kanaalmode +R worden\n" - "geforceerd, als die op het kanaal aan staat. Als +R wordt ingevuld,\n" - "zal kanaalmode +R worden geforceerd, maar ook als die niet aan" - "staat voor het kanaal. Als +R niet aan staat, zullen alle ook\n" - "gebanned worden om te zorgen dat ze niet opnieuw het kanaal binnen\n" - "kunnen komen.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Als er voor \037wat\037 MODES wordt ingevuld, zal er niks gebeuren.\n" - "Normaal gesproken wordt er een kanaalmode geforceerd die op deze\n" - "server niet ondersteund wordt. Als +R wordt ingevuld voor \037wat\037\n" - "zullen alle gebruikers die in het kanaal zitten maar zich niet\n" - "hebben geidentificeerd voor hun nick uit het kanaal gekicked en\n" - "verbannen worden.", - /* LNG_CHAN_RESPONSE */ - "Enforced %s" - }; - - /* German (DE) */ - const char *langtable_de[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Erzwingt verschieden Modes und SET Optionen", - /* LNG_ENFORCE_SYNTAX */ - "Syntax: \002ENFORCE \037Channel\037 [\037was\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Erzwingt verschieden Modes und SET Optionen. Die \037Channel\037\n" - "Option zeigt dir den Channel an, indem Modes und Optionen\n" - "zu erzwingen sind. Die \037was\037 Option zeigt dir welche Modes\n" - "und Optionen zu erzwingen sind. Die kцnnen nur SET, SECUREOPS,\n" - "RESTRICTED, MODES oder +R sein.Default ist SET.\n" - " \n" - "Wenn \037was\037 SET ist, wird SECUREOPS und RESTRICTED\n" - "auf die User die z.Z.in Channel sind erzwungen, wenn sie AN sind.\n" - "Benutze SECUREOPS oder RESTRICTED , um die Optionen einzeln\n" - "zu erzwingen, also wenn sie nicht eingeschaltet sind.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Wenn \037was\037 MODES ist, wird das ChannelMode +R erzwungen\n" - "falls an. Wenn \037was\037 +R ist, wird +R erzwungen aber eben\n" - "wenn noch nicht als Channel-Mode ist. Wenn +R noch nicht als\n" - "Channel-Mode war werden alle User aus den Channel gebannt um\n" - "sicher zu sein das sie nicht rejoinen.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Wenn \037was\037 MODES ist, wird nichts erzwungen weil es MODES seine\n" - "kцnnen die dein IRCD nicht unterstьtzt. Wenn \037was\037 +R ist\n" - "oder ein Modes was auf ein anderen IRCD gleich +R ist, wird es\n" - "erzwungen. Alle User die nicht fьr deren Nicknamen identifiziert\n" - "sind werden aus den Channel gekickt und gebannt.", - /* LNG_CHAN_RESPONSE */ - "Erzwungen %s" - }; - - /* Portuguese (PT) */ - const char *langtable_pt[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas", - /* LNG_ENFORCE_SYNTAX */ - "Sintaxe: \002ENFORCE \037canal\037 [\037opзгo\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Verifica o cumprimento de vбrios modos de canal e opзхes ajustadas.\n" - "O campo \037canal\037 indica qual canal deve ter os modos e opзхes verificadas\n" - "O campo \037opзгo\037 indica quais modos e opзхes devem ser verificadas,\n" - "e pode ser: SET, SECUREOPS, RESTRICTED, MODES ou +R\n" - "Quando deixado em branco, o padrгo й SET.\n" - " \n" - "Se \037opзгo\037 for SET, serгo verificadas as opзхes SECUREOPS e RESTRICTED\n" - "para usuбrios que estiverem no canal, caso elas estejam ativadas. Use\n" - "SECUREOPS para verificar a opзгo SECUREOPS, mesmo que ela nгo esteja ativada\n" - "Use RESTRICTED para verificar a opзгo RESTRICTED, mesmo que ela nгo esteja\n" - "ativada.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Se \037opзгo\037 for MODES, serб verificado o modo de canal +R caso ele\n" - "esteja ativado. Se +R for especificado para \037opзгo\037, o modo de canal\n" - "+R tambйm serб verificado, mesmo que ele nгo esteja ativado. Se ele nгo\n" - "estiver ativado, os usuбrios serгo banidos para evitar que reentrem no canal.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Se \037opзгo\037 for MODES, nada serб verificado, visto que isto poderia\n" - "verificar modos que o IRCd atual nгo suporta. Se +R for especificado\n" - "para \037opзгo\037, um equivalente ao modo de canal +R em outros IRCds\n" - "serб verificado. Todos os usuбrios que estгo no canal, mas nгo estejam\n" - "identificados para seus nicks serгo kickados e banidos do canal.", - /* LNG_CHAN_RESPONSE */ - "Verificado %s" - }; - - /* Russian (RU) */ - const char *langtable_ru[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Перепроверка и установка различных режимов и опций канала", - /* LNG_ENFORCE_SYNTAX */ - "Синтаксис: \002ENFORCE \037#канал\037 \037параметр\037\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Перепроверка и установка различных режимов и опций канала.\n" - "\037Параметр\037 указывает какие опции или режимы канала должны быть\n" - "перепроверены. В качестве параметра могут быть указаны: SET, SECUREOPS,\n" - "RESTRICTED, MODES, или +R. Если параметр не указан, по-умолчанию будет SET.\n" - " \n" - "Если в качестве \037параметра\037 указано SET, будут перепроверены опции\n" - "SECUREOPS и RESTRICTED относительно пользователей на указанном канале\n" - "(при условии, что опции включены). Отдельно указанный параметр SECUREOPS\n" - "применит опцию SECUREOPS (даже если она \037НЕ\037 установлена). Параметр\n" - "RESTRICTED применит опцию RESTRICTED (даже если она \037НЕ\037 установлена)", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Если в качестве \037параметра\037 указано MODES, будет перепроверен режим +R\n" - "(если он установлен). Отдельно указанный параметр \037+R\037 применит\n" - "канальный режим +R, даже если он не установлен, и забанит всех пользователей,\n" - "которые не идентифицировались к своему нику или не имеют зарегистрированного ника.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Если в качестве \037параметра\037 указано MODES, перепроверка осуществлена\n" - "НЕ БУДЕТ, так как текущий IRCD не поддерживает необходимые режимы.\n" - "Отдельно указанный параметр \037+R\037 применит канальный режим, эквивалентный\n" - "режиму +R и забанит всех пользователей, которые не идентифицировались к своему\n" - "нику или не имеют зарегистрированного ника.", - /* LNG_CHAN_RESPONSE */ - "Перепроверено: %s" - }; - - /* Italian (IT) */ - const char *langtable_it[] = { - /* LNG_CHAN_HELP */ - " ENFORCE Forza diversi modi di canale ed opzioni SET", - /* LNG_ENFORCE_SYNTAX */ - "Sintassi: \002ENFORCE \037canale\037 [\037cosa\037]\002", - /* LNG_CHAN_HELP_ENFORCE */ - "Forza diversi modi di canale ed opzioni SET. Il parametro \037canale\037\n" - "indica il canale sul quale forzare i modi e le opzioni. Il parametro\n" - "\037cosa\037 indica i modi e le opzioni da forzare, e possono essere\n" - "qualsiasi delle opzioni SET, SECUREOPS, RESTRICTED, MODES, o +R.\n" - "Se non specificato, viene sottointeso SET.\n" - " \n" - "Se \037cosa\037 и SET, forzerа SECUREOPS e RESTRICTED sugli utenti\n" - "attualmente nel canale, se sono impostati. Specifica SECUREOPS per\n" - "forzare l'opzione SECUREOPS, anche se non и attivata. Specifica\n" - "RESTRICTED per forzare l'opzione RESTRICTED, anche se non и\n" - "attivata.", - /* LNG_CHAN_HELP_ENFORCE_R_ENABLED */ - "Se \037cosa\037 и MODES, forzerа il modo del canale +R se и impostato.\n" - "Se +R и specificato per \037cosa\037, il modo del canale +R verrа\n" - "forzato, anche se non и impostato. Se non и impostato, gli utenti\n" - "verranno bannati per assicurare che non rientrino semplicemente.", - /* LNG_CHAN_HELP_ENFORCE_R_DISABLED */ - "Se \037cosa\037 и MODES, niente verrа forzato, siccome forzerebbe\n" - "dei modi che l'ircd in uso non supporterebbe. Se +R и specificato\n" - "per \037cosa\037, un modo equivalente a +R sui altri ircd verrа\n" - "forzato. Tutti gli utenti presenti nel canale ma non identificati\n" - "per il loro nickname verranno bannati ed espulsi dal canale.\n", - /* LNG_CHAN_RESPONSE */ - "Forzato %s" - }; - - this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); - this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl); - this->InsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de); - this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt); - this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru); - this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it); } }; diff --git a/modules/extra/cs_set_misc.cpp b/modules/extra/cs_set_misc.cpp index 8b4395043..e72fdec03 100644 --- a/modules/extra/cs_set_misc.cpp +++ b/modules/extra/cs_set_misc.cpp @@ -30,17 +30,17 @@ class CommandCSSetMisc : public Command if (params.size() > 1) { ci->Extend("chanserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1])); - notice_lang(Config->s_ChanServ, u, CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str()); + u->SendMessage(ChanServ, CHAN_SETTING_CHANGED, this->name.c_str(), ci->name.c_str(), params[1].c_str()); } else - notice_lang(Config->s_ChanServ, u, CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str()); + u->SendMessage(ChanServ, CHAN_SETTING_UNSET, this->name.c_str(), ci->name.c_str()); return MOD_CONT; } void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SET", CHAN_SET_SYNTAX); + SyntaxError(ChanServ, u, "SET", CHAN_SET_SYNTAX); } void OnServHelp(User *u) @@ -58,7 +58,7 @@ class CommandCSSASetMisc : public CommandCSSetMisc void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_ChanServ, u, "SASET", CHAN_SASET_SYNTAX); + SyntaxError(ChanServ, u, "SASET", CHAN_SASET_SYNTAX); } }; diff --git a/modules/extra/cs_tban.cpp b/modules/extra/cs_tban.cpp index 32bcd4add..444681262 100644 --- a/modules/extra/cs_tban.cpp +++ b/modules/extra/cs_tban.cpp @@ -17,25 +17,39 @@ #include "module.h" -#define AUTHOR "Rob" +static Module *me; -void mySendResponse(User *u, const Anope::string &channel, const Anope::string &mask, const Anope::string &time); - -void addBan(Channel *c, time_t timeout, const Anope::string &banmask); -int canBanUser(Channel *c, User *u, User *u2); +class TempBan : public CallBack +{ + private: + dynamic_reference<Channel> chan; + Anope::string mask; -void mAddLanguages(); + public: + TempBan(time_t seconds, Channel *c, const Anope::string &banmask) : CallBack(me, seconds), chan(c), mask(banmask) { } -static Module *me = NULL; + void Tick(time_t ctime) + { + if (chan && chan->ci) + chan->RemoveMode(NULL, CMODE_BAN, mask); + } +}; -enum +static bool CanBanUser(Channel *c, User *u, User *u2) { - TBAN_HELP, - TBAN_SYNTAX, - TBAN_HELP_DETAIL, - TBAN_RESPONSE, - LANG_NUM_STRINGS -}; + ChannelInfo *ci = c->ci; + bool ok = false; + if (!check_access(u, ci, CA_BAN)) + u->SendMessage(ChanServ, ACCESS_DENIED); + else if (is_excepted(ci, u2)) + u->SendMessage(ChanServ, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str()); + else if (u2->IsProtected()) + u->SendMessage(ChanServ, ACCESS_DENIED); + else + ok = true; + + return ok; +} class CommandCSTBan : public Command { @@ -55,15 +69,16 @@ class CommandCSTBan : public Command Anope::string time = params[2]; if (!(c = findchan(chan))) - notice_lang(Config->s_ChanServ, u, CHAN_X_NOT_IN_USE, chan.c_str()); + u->SendMessage(ChanServ, CHAN_X_NOT_IN_USE, chan.c_str()); else if (!(u2 = finduser(nick))) - notice_lang(Config->s_ChanServ, u, NICK_X_NOT_IN_USE, nick.c_str()); + u->SendMessage(ChanServ, NICK_X_NOT_IN_USE, nick.c_str()); else - if (canBanUser(c, u, u2)) + if (CanBanUser(c, u, u2)) { get_idealban(c->ci, u2, mask); - addBan(c, dotime(time), mask); - mySendResponse(u, chan, mask, time); + c->SetMode(NULL, CMODE_BAN, mask); + new TempBan(dotime(time), c, mask); + me->SendMessage(ChanServ, u, _("%s banned from %s, will auto-expire in %s"), mask.c_str(), c->name.c_str(), time.c_str()); } return MOD_CONT; @@ -72,20 +87,21 @@ class CommandCSTBan : public Command bool OnHelp(User *u, const Anope::string &subcommand) { this->OnSyntaxError(u, ""); - u->SendMessage(Config->s_ChanServ, " "); - me->NoticeLang(Config->s_ChanServ, u, TBAN_HELP_DETAIL); + me->SendMessage(ChanServ, u, " "); + me->SendMessage(ChanServ, u, _("Bans the given user from a channel for a specified length of\n" + "time. If the ban is removed before by hand, it will NOT be replaced.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_ChanServ, u, TBAN_SYNTAX); + me->SendMessage(ChanServ, u, _("Syntax: TBAN channel nick time")); } void OnServHelp(User *u) { - me->NoticeLang(Config->s_ChanServ, u, TBAN_HELP); + me->SendMessage(ChanServ, u, _(" TBAN Bans the user for a given length of time")); } }; @@ -100,112 +116,9 @@ class CSTBan : public Module this->AddCommand(ChanServ, &commandcstban); - this->SetAuthor(AUTHOR); + this->SetAuthor("Anope"); this->SetType(SUPPORTED); - - const char *langtable_en_us[] = { - " TBAN Bans the user for a given length of time", - "Syntax: TBAN channel nick time", - "Bans the given user from a channel for a specified length of\n" - "time. If the ban is removed before by hand, it will NOT be replaced.", - "%s banned from %s, will auto-expire in %s" - }; - - const char *langtable_nl[] = { - " TBAN Verban een gebruiker voor een bepaalde tijd", - "Syntax: TBAN kanaal nick tijd", - "Verbant de gegeven gebruiken van het gegeven kanaal voor de\n" - "gegeven tijdsduur. Als de verbanning eerder wordt verwijderd,\n" - "zal deze NIET worden vervangen.", - "%s verbannen van %s, zal verlopen in %s" - }; - - const char *langtable_de[] = { - " TBAN Bant ein User fьr eine bestimmte Zeit aus ein Channel", - "Syntax: TBAN Channel Nickname Zeit", - "Bant ein User fьr eine bestimmte Zeit aus ein Channel\n" - "Wenn der Ban manuell entfernt wird, wird es NICHT ersetzt.", - "%s gebannt von %s, wird auto-auslaufen in %s" - }; - - const char *langtable_pt[] = { - " TBAN Bane o usuбrio por um determinado perнodo de tempo", - "Sintaxe: TBAN canal nick tempo ", - "Bane de um canal o usuбrio especificado por um determinado perнodo de\n" - "tempo. Se o ban for removido manualmente antes do tempo, ele nгo serб recolocado.", - "%s foi banido do %s, irб auto-expirar em %s" - }; - - const char *langtable_ru[] = { - " TBAN Банит пользователя на указанный промежуток времени", - "Синтаксис: TBAN #канал ник время", - "Банит пользователя на указанный промежуток времени в секундах\n" - "Примечание: удаленный вручную (до своего истечения) бан НЕ БУДЕТ\n" - "переустановлен сервисами автоматически!", - "Установленный бан %s на канале %s истечет через %s секунд" - }; - - const char *langtable_it[] = { - " TBAN Banna l'utente per un periodo di tempo specificato", - "Sintassi: TBAN canale nick tempo", - "Banna l'utente specificato da un canale per un periodo di tempo\n" - "specificato. Se il ban viene rimosso a mano prima della scadenza, NON verrа rimpiazzato.", - "%s bannato da %s, scadrа automaticamente tra %s" - }; - - this->InsertLanguage(LANG_EN_US, LANG_NUM_STRINGS, langtable_en_us); - this->InsertLanguage(LANG_NL, LANG_NUM_STRINGS, langtable_nl); - this->InsertLanguage(LANG_DE, LANG_NUM_STRINGS, langtable_de); - this->InsertLanguage(LANG_PT, LANG_NUM_STRINGS, langtable_pt); - this->InsertLanguage(LANG_RU, LANG_NUM_STRINGS, langtable_ru); - this->InsertLanguage(LANG_IT, LANG_NUM_STRINGS, langtable_it); } }; -void mySendResponse(User *u, const Anope::string &channel, const Anope::string &mask, const Anope::string &time) -{ - me->NoticeLang(Config->s_ChanServ, u, TBAN_RESPONSE, mask.c_str(), channel.c_str(), time.c_str()); -} - -class TempBan : public CallBack -{ - private: - Anope::string chan; - Anope::string mask; - - public: - TempBan(time_t seconds, const Anope::string &channel, const Anope::string &banmask) : CallBack(me, seconds), chan(channel), mask(banmask) { } - - void Tick(time_t ctime) - { - Channel *c; - - if ((c = findchan(chan)) && c->ci) - c->RemoveMode(NULL, CMODE_BAN, mask); - } -}; - -void addBan(Channel *c, time_t timeout, const Anope::string &banmask) -{ - c->SetMode(NULL, CMODE_BAN, banmask); - - new TempBan(timeout, c->name, banmask); -} - -int canBanUser(Channel *c, User *u, User *u2) -{ - ChannelInfo *ci = c->ci; - int ok = 0; - if (!check_access(u, ci, CA_BAN)) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); - else if (is_excepted(ci, u2)) - notice_lang(Config->s_ChanServ, u, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str()); - else if (u2->IsProtected()) - notice_lang(Config->s_ChanServ, u, ACCESS_DENIED); - else - ok = 1; - - return ok; -} - MODULE_INIT(CSTBan) diff --git a/modules/extra/db_mysql.cpp b/modules/extra/db_mysql.cpp index eb55a3952..b15ce4de4 100644 --- a/modules/extra/db_mysql.cpp +++ b/modules/extra/db_mysql.cpp @@ -291,13 +291,13 @@ class CommandSQLSync : public Command bool OnHelp(User *u, const Anope::string &subcommand) { - notice_help(Config->s_OperServ, u, OPER_HELP_SYNC); + u->SendMessage(OperServ, OPER_HELP_SYNC); return true; } void OnServHelp(User *u) { - notice_lang(Config->s_OperServ, u, OPER_HELP_CMD_SQLSYNC); + u->SendMessage(OperServ, OPER_HELP_CMD_SQLSYNC); } }; @@ -429,7 +429,7 @@ class DBMySQL : public Module } } - nc->language = r.Get(i, "language").is_number_only() ? convertTo<int>(r.Get(i, "language")) : LANG_EN_US; + nc->language = r.Get(i, "language"); nc->channelcount = r.Get(i, "channelcount").is_number_only() ? convertTo<int>(r.Get(i, "channelcount")) : 0; nc->memos.memomax = r.Get(i, "memomax").is_number_only() ? convertTo<int>(r.Get(i, "memomax")) : 20; } @@ -1533,7 +1533,7 @@ static void SaveDatabases() CommandReturn CommandSQLSync::Execute(User *u, const std::vector<Anope::string> ¶ms) { SaveDatabases(); - notice_lang(Config->s_OperServ, u, OPER_SYNC_UPDATED); + u->SendMessage(OperServ, OPER_SYNC_UPDATED); return MOD_CONT; } diff --git a/modules/extra/hs_request.cpp b/modules/extra/hs_request.cpp index edca02ade..9ae097d27 100644 --- a/modules/extra/hs_request.cpp +++ b/modules/extra/hs_request.cpp @@ -1,5 +1,5 @@ /* hs_request.c - Add request and activate functionality to HostServ, - * along with adding +req as optional param to HostServ list. + * * * (C) 2003-2010 Anope Team * Contact us at team@anope.org @@ -17,48 +17,12 @@ #include "module.h" -#define AUTHOR "Rob" - -/* Configuration variables */ -int HSRequestMemoUser = 0; -int HSRequestMemoOper = 0; -int HSRequestMemoSetters = 0; - -/* Language defines */ -enum -{ - LNG_REQUEST_SYNTAX, - LNG_REQUESTED, - LNG_REQUEST_WAIT, - LNG_REQUEST_MEMO, - LNG_ACTIVATE_SYNTAX, - LNG_ACTIVATED, - LNG_ACTIVATE_MEMO, - LNG_REJECT_SYNTAX, - LNG_REJECTED, - LNG_REJECT_MEMO, - LNG_REJECT_MEMO_REASON, - LNG_NO_REQUEST, - LNG_HELP, - LNG_HELP_SETTER, - LNG_HELP_REQUEST, - LNG_HELP_ACTIVATE, - LNG_HELP_ACTIVATE_MEMO, - LNG_HELP_REJECT, - LNG_HELP_REJECT_MEMO, - LNG_WAITING_SYNTAX, - LNG_HELP_WAITING, - LNG_NUM_STRINGS -}; +static bool HSRequestMemoUser = false; +static bool HSRequestMemoOper = false; void my_add_host_request(const Anope::string &nick, const Anope::string &vIdent, const Anope::string &vhost, const Anope::string &creator, time_t tmp_time); -int my_isvalidchar(char c); -void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...); void req_send_memos(User *u, const Anope::string &vIdent, const Anope::string &vHost); -void my_load_config(); -void my_add_languages(); - struct HostRequest { Anope::string ident; @@ -73,6 +37,13 @@ static Module *me; class CommandHSRequest : public Command { + bool isvalidchar(char c) + { + if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '.' || c == '-') + return true; + return false; + } + public: CommandHSRequest() : Command("REQUEST", 1, 1) { @@ -91,24 +62,24 @@ class CommandHSRequest : public Command rawhostmask = myStrGetTokenRemainder(rawhostmask, '@', 1); /* get the remaining string */ if (rawhostmask.empty()) { - me->NoticeLang(Config->s_HostServ, u, LNG_REQUEST_SYNTAX); + me->SendMessage(HostServ, u, _("Syntax: \002REQUEST \037vhost\037\002")); return MOD_CONT; } if (vIdent.length() > Config->UserLen) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENTTOOLONG, Config->UserLen); + u->SendMessage(HostServ, HOST_SET_IDENTTOOLONG, Config->UserLen); return MOD_CONT; } else for (Anope::string::iterator s = vIdent.begin(), s_end = vIdent.end(); s != s_end; ++s) - if (!my_isvalidchar(*s)) + if (!isvalidchar(*s)) { - notice_lang(Config->s_HostServ, u, HOST_SET_IDENT_ERROR); + u->SendMessage(HostServ, HOST_SET_IDENT_ERROR); return MOD_CONT; } if (!ircd->vident) { - notice_lang(Config->s_HostServ, u, HOST_NO_VIDENT); + u->SendMessage(HostServ, HOST_NO_VIDENT); return MOD_CONT; } } @@ -116,53 +87,54 @@ class CommandHSRequest : public Command hostmask = rawhostmask; else { - notice_lang(Config->s_HostServ, u, HOST_SET_TOOLONG, Config->HostLen); + u->SendMessage(HostServ, HOST_SET_TOOLONG, Config->HostLen); return MOD_CONT; } if (!isValidHost(hostmask, 3)) { - notice_lang(Config->s_HostServ, u, HOST_SET_ERROR); + u->SendMessage(HostServ, HOST_SET_ERROR); return MOD_CONT; } if ((na = findnick(nick))) { - if ((HSRequestMemoOper || HSRequestMemoSetters) && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime) + if (HSRequestMemoOper && Config->MSSendDelay > 0 && u && u->lastmemosend + Config->MSSendDelay > Anope::CurTime) { - me->NoticeLang(Config->s_HostServ, u, LNG_REQUEST_WAIT, Config->MSSendDelay); + me->SendMessage(HostServ, u, _("Please wait %d seconds before requesting a new vHost"), Config->MSSendDelay); u->lastmemosend = Anope::CurTime; return MOD_CONT; } my_add_host_request(nick, vIdent, hostmask, u->nick, Anope::CurTime); - me->NoticeLang(Config->s_HostServ, u, LNG_REQUESTED); + me->SendMessage(HostServ, u, _("Your vHost has been requested")); req_send_memos(u, vIdent, hostmask); Log(LOG_COMMAND, u, this, NULL) << "to request new vhost " << (!vIdent.empty() ? vIdent + "@" : "") << hostmask; } else - notice_lang(Config->s_HostServ, u, HOST_NOREG, nick.c_str()); + u->SendMessage(HostServ, HOST_NOREG, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_REQUEST_SYNTAX); - u->SendMessage(Config->s_HostServ, " "); - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_REQUEST); - + me->SendMessage(HostServ, u, _("Syntax: \002REQUEST \037vhost\037\002")); + me->SendMessage(HostServ, u, " "); + me->SendMessage(HostServ, u, _("Request the given vHost to be actived for your nick by the\n" + "network administrators. Please be patient while your request\n" + "is being considered.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_REQUEST_SYNTAX); + me->SendMessage(HostServ, u, _("Syntax: \002REQUEST \037vhost\037\002")); } void OnServHelp(User *u) { - me->NoticeLang(Config->s_HostServ, u, LNG_HELP); + me->SendMessage(HostServ, u, _(" REQUEST Request a vHost for your nick")); } }; @@ -186,41 +158,43 @@ class CommandHSActivate : public Command na->hostinfo.SetVhost(it->second->ident, it->second->host, u->nick, it->second->time); if (HSRequestMemoUser) - my_memo_lang(u, na->nick, 2, LNG_ACTIVATE_MEMO); + memo_send(u, na->nick, _("[auto memo] Your requested vHost has been approved."), 2); - me->NoticeLang(Config->s_HostServ, u, LNG_ACTIVATED, na->nick.c_str()); + me->SendMessage(HostServ, u, _("vHost for %s has been activated"), na->nick.c_str()); Log(LOG_COMMAND, u, this, NULL) << "for " << na->nick << " for vhost " << (!it->second->ident.empty() ? it->second->ident + "@" : "") << it->second->host; delete it->second; Requests.erase(it); } else - me->NoticeLang(Config->s_HostServ, u, LNG_NO_REQUEST, nick.c_str()); + me->SendMessage(HostServ, u, _("No request for nick %s found."), nick.c_str()); } else - notice_lang(Config->s_HostServ, u, NICK_X_NOT_REGISTERED, nick.c_str()); + u->SendMessage(HostServ, NICK_X_NOT_REGISTERED, nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_ACTIVATE_SYNTAX); - u->SendMessage(Config->s_HostServ, " "); - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_ACTIVATE); + me->SendMessage(HostServ, u, _("Syntax: \002ACTIVATE \037nick\037\002")); + me->SendMessage(HostServ, u, " "); + me->SendMessage(HostServ, u, _("Activate the requested vHost for the given nick.")); if (HSRequestMemoUser) - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_ACTIVATE_MEMO); + me->SendMessage(HostServ, u, _("A memo informing the user will also be sent.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_ACTIVATE_SYNTAX); + me->SendMessage(HostServ, u, _("Syntax: \002ACTIVATE \037nick\037\002")); } void OnServHelp(User *u) { - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_SETTER); + me->SendMessage(HostServ, u, _(" ACTIVATE Approve the requested vHost of a user\n" + " REJECT Reject the requested vHost of a user\n" + " WAITING Convenience command for LIST +req")); } }; @@ -244,35 +218,38 @@ class CommandHSReject : public Command if (HSRequestMemoUser) { + char message[BUFSIZE]; if (!reason.empty()) - my_memo_lang(u, nick, 2, LNG_REJECT_MEMO_REASON, reason.c_str()); + snprintf(message, sizeof(message), _("[auto memo] Your requested vHost has been rejected. Reason: %s"), reason.c_str()); else - my_memo_lang(u, nick, 2, LNG_REJECT_MEMO); + snprintf(message, sizeof(message), _("[auto memo] Your requested vHost has been rejected.")); + + memo_send(u, nick, message, 2); } - me->NoticeLang(Config->s_HostServ, u, LNG_REJECTED, nick.c_str()); + me->SendMessage(HostServ, u, _("vHost for %s has been rejected"), nick.c_str()); Log(LOG_COMMAND, u, this, NULL) << "to reject vhost for " << nick << " (" << (!reason.empty() ? reason : "") << ")"; } else - me->NoticeLang(Config->s_HostServ, u, LNG_NO_REQUEST, nick.c_str()); + me->SendMessage(HostServ, u, _("No request for nick %s found."), nick.c_str()); return MOD_CONT; } bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_REJECT_SYNTAX); - u->SendMessage(Config->s_HostServ, " "); - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_REJECT); + me->SendMessage(HostServ, u, _("Syntax: \002REJECT \037nick\037\002")); + me->SendMessage(HostServ, u, " "); + me->SendMessage(HostServ, u, _("Reject the requested vHost for the given nick.")); if (HSRequestMemoUser) - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_REJECT_MEMO); + me->SendMessage(HostServ, u, _("A memo informing the user will also be sent.")); return true; } void OnSyntaxError(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_REJECT_SYNTAX); + me->SendMessage(HostServ, u, _("Syntax: \002REJECT \037nick\037\002")); } }; @@ -281,11 +258,9 @@ class HSListBase : public Command protected: CommandReturn DoList(User *u) { - char buf[BUFSIZE]; int counter = 1; int from = 0, to = 0; unsigned display_counter = 0; - tm *tm; for (RequestMap::iterator it = Requests.begin(), it_end = Requests.end(); it != it_end; ++it) { @@ -293,16 +268,14 @@ class HSListBase : public Command if (((counter >= from && counter <= to) || (!from && !to)) && display_counter < Config->NSListMax) { ++display_counter; - tm = localtime(&hr->time); - strftime(buf, sizeof(buf), getstring(u, STRFTIME_DATE_TIME_FORMAT), tm); if (!hr->ident.empty()) - notice_lang(Config->s_HostServ, u, HOST_IDENT_ENTRY, counter, it->first.c_str(), hr->ident.c_str(), hr->host.c_str(), it->first.c_str(), buf); + u->SendMessage(HostServ, HOST_IDENT_ENTRY, counter, it->first.c_str(), hr->ident.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str()); else - notice_lang(Config->s_HostServ, u, HOST_ENTRY, counter, it->first.c_str(), hr->host.c_str(), it->first.c_str(), buf); + u->SendMessage(HostServ, HOST_ENTRY, counter, it->first.c_str(), hr->host.c_str(), it->first.c_str(), do_strftime(hr->time).c_str()); } ++counter; } - notice_lang(Config->s_HostServ, u, HOST_LIST_FOOTER, display_counter); + u->SendMessage(HostServ, HOST_LIST_FOOTER, display_counter); return MOD_CONT; } @@ -331,9 +304,10 @@ class CommandHSWaiting : public HSListBase bool OnHelp(User *u, const Anope::string &subcommand) { - me->NoticeLang(Config->s_HostServ, u, LNG_WAITING_SYNTAX); - u->SendMessage(Config->s_HostServ, " "); - me->NoticeLang(Config->s_HostServ, u, LNG_HELP_WAITING); + me->SendMessage(HostServ, u, _("Syntax: \002WAITING\002")); + me->SendMessage(HostServ, u, " "); + me->SendMessage(HostServ, u, _("This command is provided for convenience. It is essentially\n" + "the same as performing a LIST +req .")); return true; } @@ -356,269 +330,13 @@ class HSRequest : public Module this->AddCommand(HostServ, &commandhsreject); this->AddCommand(HostServ, &commandhswaiting); - this->SetAuthor(AUTHOR); + this->SetAuthor("Anope"); this->SetType(SUPPORTED); - my_load_config(); - - const char *langtable_en_us[] = { - /* LNG_REQUEST_SYNTAX */ - "Syntax: \002REQUEST \037vhost\037\002", - /* LNG_REQUESTED */ - "Your vHost has been requested", - /* LNG_REQUEST_WAIT */ - "Please wait %d seconds before requesting a new vHost", - /* LNG_REQUEST_MEMO */ - "[auto memo] vHost \002%s\002 has been requested.", - /* LNG_ACTIVATE_SYNTAX */ - "Syntax: \002ACTIVATE \037nick\037\002", - /* LNG_ACTIVATED */ - "vHost for %s has been activated", - /* LNG_ACTIVATE_MEMO */ - "[auto memo] Your requested vHost has been approved.", - /* LNG_REJECT_SYNTAX */ - "Syntax: \002REJECT \037nick\037\002", - /* LNG_REJECTED */ - "vHost for %s has been rejected", - /* LNG_REJECT_MEMO */ - "[auto memo] Your requested vHost has been rejected.", - /* LNG_REJECT_MEMO_REASON */ - "[auto memo] Your requested vHost has been rejected. Reason: %s", - /* LNG_NO_REQUEST */ - "No request for nick %s found.", - /* LNG_HELP */ - " REQUEST Request a vHost for your nick", - /* LNG_HELP_SETTER */ - " ACTIVATE Approve the requested vHost of a user\n" - " REJECT Reject the requested vHost of a user\n" - " WAITING Convenience command for LIST +req", - /* LNG_HELP_REQUEST */ - "Request the given vHost to be actived for your nick by the\n" - "network administrators. Please be patient while your request\n" - "is being considered.", - /* LNG_HELP_ACTIVATE */ - "Activate the requested vHost for the given nick.", - /* LNG_HELP_ACTIVATE_MEMO */ - "A memo informing the user will also be sent.", - /* LNG_HELP_REJECT */ - "Reject the requested vHost for the given nick.", - /* LNG_HELP_REJECT_MEMO */ - "A memo informing the user will also be sent.", - /* LNG_WAITING_SYNTAX */ - "Syntax: \002WAITING\002", - /* LNG_HELP_WAITING */ - "This command is provided for convenience. It is essentially\n" - "the same as performing a LIST +req ." - }; - - const char *langtable_nl[] = { - /* LNG_REQUEST_SYNTAX */ - "Gebruik: \002REQUEST \037vhost\037\002", - /* LNG_REQUESTED */ - "Je vHost is aangevraagd", - /* LNG_REQUEST_WAIT */ - "Wacht %d seconden voor je een nieuwe vHost aanvraagt", - /* LNG_REQUEST_MEMO */ - "[auto memo] vHost \002%s\002 is aangevraagd.", - /* LNG_ACTIVATE_SYNTAX */ - "Gebruik: \002ACTIVATE \037nick\037\002", - /* LNG_ACTIVATED */ - "vHost voor %s is geactiveerd", - /* LNG_ACTIVATE_MEMO */ - "[auto memo] Je aangevraagde vHost is geaccepteerd.", - /* LNG_REJECT_SYNTAX */ - "Gebruik: \002REJECT \037nick\037\002", - /* LNG_REJECTED */ - "vHost voor %s is afgekeurd", - /* LNG_REJECT_MEMO */ - "[auto memo] Je aangevraagde vHost is afgekeurd.", - /* LNG_REJECT_MEMO_REASON */ - "[auto memo] Je aangevraagde vHost is afgekeurd. Reden: %s", - /* LNG_NO_REQUEST */ - "Geen aanvraag voor nick %s gevonden.", - /* LNG_HELP */ - " REQUEST Vraag een vHost aan voor je nick", - /* LNG_HELP_SETTER */ - " ACTIVATE Activeer de aangevraagde vHost voor een gebruiker\n" - " REJECT Keur de aangevraagde vHost voor een gebruiker af\n" - " WAITING Snelkoppeling naar LIST +req", - /* LNG_HELP_REQUEST */ - "Verzoek de gegeven vHost te activeren voor jouw nick bij de\n" - "netwerk beheerders. Het kan even duren voordat je aanvraag\n" - "afgehandeld wordt.", - /* LNG_HELP_ACTIVATE */ - "Activeer de aangevraagde vHost voor de gegeven nick.", - /* LNG_HELP_ACTIVATE_MEMO */ - "Een memo die de gebruiker op de hoogste stelt zal ook worden verstuurd.", - /* LNG_HELP_REJECT */ - "Keur de aangevraagde vHost voor de gegeven nick af.", - /* LNG_HELP_REJECT_MEMO */ - "Een memo die de gebruiker op de hoogste stelt zal ook worden verstuurd.", - /* LNG_WAITING_SYNTAX */ - "Gebruik: \002WAITING\002", - /* LNG_HELP_WAITING */ - "Dit commando is beschikbaar als handigheid. Het is simpelweg\n" - "hetzelfde als LIST +req ." - }; - - const char *langtable_pt[] = { - /* LNG_REQUEST_SYNTAX */ - "Sintaxe: \002REQUEST \037vhost\037\002", - /* LNG_REQUESTED */ - "Seu pedido de vHost foi encaminhado", - /* LNG_REQUEST_WAIT */ - "Por favor, espere %d segundos antes de fazer um novo pedido de vHost", - /* LNG_REQUEST_MEMO */ - "[Auto Memo] O vHost \002%s\002 foi solicitado.", - /* LNG_ACTIVATE_SYNTAX */ - "Sintaxe: \002ACTIVATE \037nick\037\002", - /* LNG_ACTIVATED */ - "O vHost para %s foi ativado", - /* LNG_ACTIVATE_MEMO */ - "[Auto Memo] Seu pedido de vHost foi aprovado.", - /* LNG_REJECT_SYNTAX */ - "Sintaxe: \002REJECT \037nick\037\002", - /* LNG_REJECTED */ - "O vHost de %s foi recusado", - /* LNG_REJECT_MEMO */ - "[Auto Memo] Seu pedido de vHost foi recusado.", - /* LNG_REJECT_MEMO_REASON */ - "[Auto Memo] Seu pedido de vHost foi recusado. Motivo: %s", - /* LNG_NO_REQUEST */ - "Nenhum pedido encontrado para o nick %s.", - /* LNG_HELP */ - " REQUEST Request a vHost for your nick", - /* LNG_HELP_SETTER */ - " ACTIVATE Aprova o pedido de vHost de um usuбrio\n" - " REJECT Recusa o pedido de vHost de um usuбrio\n" - " WAITING Comando para LISTAR +req", - /* LNG_HELP_REQUEST */ - "Solicita a ativaзгo do vHost fornecido em seu nick pelos\n" - "administradores da rede. Por favor, tenha paciкncia\n" - "enquanto seu pedido й analisado.", - /* LNG_HELP_ACTIVATE */ - "Ativa o vHost solicitado para o nick fornecido.", - /* LNG_HELP_ACTIVATE_MEMO */ - "Um memo informando o usuбrio tambйm serб enviado.", - /* LNG_HELP_REJECT */ - "Recusa o pedido de vHost para o nick fornecido.", - /* LNG_HELP_REJECT_MEMO */ - "Um memo informando o usuбrio tambйm serб enviado.", - /* LNG_WAITING_SYNTAX */ - "Sintaxe: \002WAITING\002", - /* LNG_HELP_WAITING */ - "Este comando й usado por conveniкncia. Й essencialmente\n" - "o mesmo que fazer um LIST +req" - }; - - const char *langtable_ru[] = { - /* LNG_REQUEST_SYNTAX */ - "Синтаксис: \002REQUEST \037vHost\037\002", - /* LNG_REQUESTED */ - "Ваш запрос на vHost отправлен.", - /* LNG_REQUEST_WAIT */ - "Пожалуйста, подождите %d секунд, прежде чем запрашивать новый vHost", - /* LNG_REQUEST_MEMO */ - "[авто-сообщение] Был запрошен vHost \002%s\002", - /* LNG_ACTIVATE_SYNTAX */ - "Синтаксис: \002ACTIVATE \037ник\037\002", - /* LNG_ACTIVATED */ - "vHost для %s успешно активирован", - /* LNG_ACTIVATE_MEMO */ - "[авто-сообщение] Запрашиваемый вами vHost утвержден и активирован.", - /* LNG_REJECT_SYNTAX */ - "Синтаксис: \002REJECT \037ник\037\002", - /* LNG_REJECTED */ - "vHost для %s отклонен.", - /* LNG_REJECT_MEMO */ - "[авто-сообщение] Запрашиваемый вами vHost отклонен.", - /* LNG_REJECT_MEMO_REASON */ - "[авто-сообщение] Запрашиваемый вами vHost отклонен. Причина: %s", - /* LNG_NO_REQUEST */ - "Запрос на vHost для ника %s не найден.", - /* LNG_HELP */ - " REQUEST Запрос на vHost для вашего текущего ника", - /* LNG_HELP_SETTER */ - " ACTIVATE Утвердить запрашиваемый пользователем vHost\n" - " REJECT Отклонить запрашиваемый пользователем vHost\n" - " WAITING Список запросов ожидающих обработки (аналог LIST +req)", - /* LNG_HELP_REQUEST */ - "Отправляет запрос на активацию vHost, который будет рассмотрен одним из\n" - "администраторов сети. Просьба проявить терпение, пока запрос\n" - "рассматривается администрацией.", - /* LNG_HELP_ACTIVATE */ - "Утвердить запрашиваемый vHost для указанного ника.", - /* LNG_HELP_ACTIVATE_MEMO */ - "Пользователю будет послано авто-уведомление об активации его запроса.", - /* LNG_HELP_REJECT */ - "Отклонить запрашиваемый vHost для указанного ника.", - /* LNG_HELP_REJECT_MEMO */ - "Пользователю будет послано авто-уведомление об отклонении его запроса.", - /* LNG_WAITING_SYNTAX */ - "Синтаксис: \002WAITING\002", - /* LNG_HELP_WAITING */ - "Данная команда создана для удобства использования и выводит список запросов,\n" - "ожидающих обработки. Аналогичная команда: LIST +req ." - }; - - const char *langtable_it[] = { - /* LNG_REQUEST_SYNTAX */ - "Sintassi: \002REQUEST \037vhost\037\002", - /* LNG_REQUESTED */ - "Il tuo vHost и stato richiesto", - /* LNG_REQUEST_WAIT */ - "Prego attendere %d secondi prima di richiedere un nuovo vHost", - /* LNG_REQUEST_MEMO */ - "[auto memo] и stato richiesto il vHost \002%s\002.", - /* LNG_ACTIVATE_SYNTAX */ - "Sintassi: \002ACTIVATE \037nick\037\002", - /* LNG_ACTIVATED */ - "Il vHost per %s и stato attivato", - /* LNG_ACTIVATE_MEMO */ - "[auto memo] Il vHost da te richiesto и stato approvato.", - /* LNG_REJECT_SYNTAX */ - "Sintassi: \002REJECT \037nick\037\002", - /* LNG_REJECTED */ - "Il vHost per %s и stato rifiutato", - /* LNG_REJECT_MEMO */ - "[auto memo] Il vHost da te richiesto и stato rifiutato.", - /* LNG_REJECT_MEMO_REASON */ - "[auto memo] Il vHost da te richiesto и stato rifiutato. Motivo: %s", - /* LNG_NO_REQUEST */ - "Nessuna richiesta trovata per il nick %s.", - /* LNG_HELP */ - " REQUEST Richiede un vHost per il tuo nick", - /* LNG_HELP_SETTER */ - " ACTIVATE Approva il vHost richiesto di un utente\n" - " REJECT Rifiuta il vHost richiesto di un utente\n" - " WAITING Comando per LIST +req", - /* LNG_HELP_REQUEST */ - "Richiede l'attivazione del vHost specificato per il tuo nick da parte\n" - "degli amministratori di rete. Sei pregato di pazientare finchи la tua\n" - "richiesta viene elaborata.", - /* LNG_HELP_ACTIVATE */ - "Attiva il vHost richiesto per il nick specificato.", - /* LNG_HELP_ACTIVATE_MEMO */ - "Viene inviato un memo per informare l'utente.", - /* LNG_HELP_REJECT */ - "Rifiuta il vHost richiesto per il nick specificato.", - /* LNG_HELP_REJECT_MEMO */ - "Viene inviato un memo per informare l'utente.", - /* LNG_WAITING_SYNTAX */ - "Sintassi: \002WAITING\002", - /* LNG_HELP_WAITING */ - "Questo comando и per comoditа. Praticamente и la stessa cosa che\n" - "eseguire un LIST +req ." - }; - - this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); - this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl); - this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt); - this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru); - this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it); - - Implementation i[] = { I_OnPreCommand, I_OnDatabaseRead, I_OnDatabaseWrite }; - ModuleManager::Attach(i, this, 3); + this->OnReload(false); + + Implementation i[] = { I_OnPreCommand, I_OnDatabaseRead, I_OnDatabaseWrite, I_OnReload }; + ModuleManager::Attach(i, this, 4); } ~HSRequest() @@ -693,51 +411,16 @@ class HSRequest : public Module Write(buf.str()); } } -}; -void my_memo_lang(User *u, const Anope::string &name, int z, int number, ...) -{ - va_list va; - char buffer[4096], outbuf[4096]; - char *fmt = NULL; - int lang = LANG_EN_US; - char *s, *t, *buf; - User *u2; - - u2 = finduser(name); - /* Find the users lang, and use it if we cant */ - if (u2 && u2->Account()) - lang = u2->Account()->language; - - /* If the users lang isnt supported, drop back to enlgish */ - if (!me->lang[lang].argc) - lang = LANG_EN_US; - - /* If the requested lang string exists for the language */ - if (me->lang[lang].argc > number) + void OnReload(bool) { - fmt = me->lang[lang].argv[number]; + ConfigReader config; + HSRequestMemoUser = config.ReadFlag("hs_request", "memouser", "no", 0); + HSRequestMemoOper = config.ReadFlag("hs_request", "memooper", "no", 0); - buf = strdup(fmt); // XXX - s = buf; - while (*s) - { - t = s; - s += strcspn(s, "\n"); - if (*s) - *s++ = '\0'; - strscpy(outbuf, t, sizeof(outbuf)); - - va_start(va, number); - vsnprintf(buffer, 4095, outbuf, va); - va_end(va); - memo_send(u, name, buffer, z); - } - free(buf); // XXX + Log(LOG_DEBUG) << "[hs_request] Set config vars: MemoUser=" << HSRequestMemoUser << " MemoOper=" << HSRequestMemoOper; } - else - Log() << me->name << ": INVALID language string call, language: [" << lang << "], String [" << number << "]"; -} +}; void req_send_memos(User *u, const Anope::string &vIdent, const Anope::string &vHost) { @@ -753,14 +436,10 @@ void req_send_memos(User *u, const Anope::string &vIdent, const Anope::string &v for (it = Config->Opers.begin(), it_end = Config->Opers.end(); it != it_end; ++it) { Anope::string nick = it->first; - my_memo_lang(u, nick, 2, LNG_REQUEST_MEMO, host.c_str()); + char message[BUFSIZE]; + snprintf(message, sizeof(message), _("[auto memo] vHost \002%s\002 has been requested."), host.c_str()); + memo_send(u, nick, message, 2); } - if (HSRequestMemoSetters == 1) - { - /* Needs to be rethought because of removal of HostSetters in favor of opertype priv -- CyberBotX - for (i = 0; i < HostNumber; ++i) - my_memo_lang(u, HostSetters[i], z, LNG_REQUEST_MEMO, host);*/ - } } void my_add_host_request(const Anope::string &nick, const Anope::string &vIdent, const Anope::string &vhost, const Anope::string &creator, time_t tmp_time) @@ -778,22 +457,13 @@ void my_add_host_request(const Anope::string &nick, const Anope::string &vIdent, Requests.insert(std::make_pair(nick, hr)); } -int my_isvalidchar(char c) -{ - if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '.' || c == '-') - return 1; - else - return 0; -} - void my_load_config() { ConfigReader config; HSRequestMemoUser = config.ReadFlag("hs_request", "memouser", "no", 0); HSRequestMemoOper = config.ReadFlag("hs_request", "memooper", "no", 0); - HSRequestMemoSetters = config.ReadFlag("hs_request", "memosetters", "no", 0); - Log(LOG_DEBUG) << "[hs_request] Set config vars: MemoUser=" << HSRequestMemoUser << " MemoOper=" << HSRequestMemoOper << " MemoSetters=" << HSRequestMemoSetters; + Log(LOG_DEBUG) << "[hs_request] Set config vars: MemoUser=" << HSRequestMemoUser << " MemoOper=" << HSRequestMemoOper; } MODULE_INIT(HSRequest) diff --git a/modules/extra/ns_maxemail.cpp b/modules/extra/ns_maxemail.cpp index 26ee9a96d..9be204d29 100644 --- a/modules/extra/ns_maxemail.cpp +++ b/modules/extra/ns_maxemail.cpp @@ -15,91 +15,61 @@ #include "module.h" -#define AUTHOR "Anope" +class NSMaxEmail : public Module +{ + int NSEmailMax; -void my_load_config(); -void my_add_languages(); -bool check_email_limit_reached(const Anope::string &email, User *u); + bool CheckLimitReached(const Anope::string &email, User *u) + { + if (this->NSEmailMax < 1 || email.empty()) + return false; -int NSEmailMax = 0; + if (this->CountEmail(email, u) < this->NSEmailMax) + return false; -enum -{ - LNG_NSEMAILMAX_REACHED, - LNG_NSEMAILMAX_REACHED_ONE, - LNG_NUM_STRINGS -}; + if (this->NSEmailMax == 1) + this->SendMessage(NickServ, u, _("The given email address has reached it's usage limit of 1 user.")); + else + this->SendMessage(NickServ, u, _("The given email address has reached it's usage limit of %d users."), this->NSEmailMax); -static Module *me; + return true; + } + + int CountEmail(const Anope::string &email, User *u) + { + int count = 0; + + if (email.empty()) + return 0; + + for (nickcore_map::const_iterator it = NickCoreList.begin(), it_end = NickCoreList.end(); it != it_end; ++it) + { + NickCore *nc = it->second; + + if (!(u->Account() && u->Account() == nc) && !nc->email.empty() && nc->email.equals_ci(email)) + ++count; + } + + return count; + } -class NSMaxEmail : public Module -{ public: NSMaxEmail(const Anope::string &modname, const Anope::string &creator) : Module(modname, creator) { - me = this; - - this->SetAuthor(AUTHOR); + this->SetAuthor("Anope"); this->SetType(SUPPORTED); ModuleManager::Attach(I_OnReload, this); ModuleManager::Attach(I_OnPreCommand, this); - my_load_config(); - - const char *langtable_en_us[] = { - /* LNG_NSEMAILMAX_REACHED */ - "The given email address has reached it's usage limit of %d users.", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "The given email address has reached it's usage limit of 1 user." - }; - - const char *langtable_nl[] = { - /* LNG_NSEMAILMAX_REACHED */ - "Het gegeven email adres heeft de limiet van %d gebruikers bereikt.", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "Het gegeven email adres heeft de limiet van 1 gebruiker bereikt." - }; - - const char *langtable_de[] = { - /* LNG_NSEMAILMAX_REACHED */ - "Die angegebene eMail hat die limit Begrenzung von %d User erreicht.", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "Die angegebene eMail hat die limit Begrenzung von 1 User erreicht." - }; - - const char *langtable_pt[] = { - /* LNG_NSEMAILMAX_REACHED */ - "O endereзo de email fornecido alcanзou seu limite de uso de %d usuбrios.", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "O endereзo de email fornecido alcanзou seu limite de uso de 1 usuбrio." - }; - - const char *langtable_ru[] = { - /* LNG_NSEMAILMAX_REACHED */ - "Указанный вами email-адрес используется максимально допустимое кол-во раз: %d", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "Указанный вами email-адрес уже кем-то используется." - }; - - const char *langtable_it[] = { - /* LNG_NSEMAILMAX_REACHED */ - "L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di %d utenti.", - /* LNG_NSEMAILMAX_REACHED_ONE */ - "L'indirizzo email specificato ha raggiunto il suo limite d'utilizzo di 1 utente." - }; - - this->InsertLanguage(LANG_EN_US, LNG_NUM_STRINGS, langtable_en_us); - this->InsertLanguage(LANG_NL, LNG_NUM_STRINGS, langtable_nl); - this->InsertLanguage(LANG_DE, LNG_NUM_STRINGS, langtable_de); - this->InsertLanguage(LANG_PT, LNG_NUM_STRINGS, langtable_pt); - this->InsertLanguage(LANG_RU, LNG_NUM_STRINGS, langtable_ru); - this->InsertLanguage(LANG_IT, LNG_NUM_STRINGS, langtable_it); + OnReload(false); } - void OnReload(bool started) + void OnReload(bool) { - my_load_config(); + ConfigReader config; + this->NSEmailMax = config.ReadInteger("ns_maxemail", "maxemails", "0", 0, false); + Log(LOG_DEBUG) << "[ns_maxemail] NSEmailMax set to " << NSEmailMax; } EventReturn OnPreCommand(User *u, BotInfo *service, const Anope::string &command, const std::vector<Anope::string> ¶ms) @@ -108,7 +78,7 @@ class NSMaxEmail : public Module { if (command.equals_ci("REGISTER")) { - if (check_email_limit_reached(params.size() > 1 ? params[1] : "", u)) + if (CheckLimitReached(params.size() > 1 ? params[1] : "", u)) return EVENT_STOP; } else if (command.equals_ci("SET")) @@ -116,7 +86,7 @@ class NSMaxEmail : public Module Anope::string set = params[0]; Anope::string email = params.size() > 1 ? params[1] : ""; - if (set.equals_ci("email") && check_email_limit_reached(email, u)) + if (set.equals_ci("email") && CheckLimitReached(email, u)) return EVENT_STOP; } } @@ -125,45 +95,4 @@ class NSMaxEmail : public Module } }; -int count_email_in_use(const Anope::string &email, User *u) -{ - int count = 0; - - if (email.empty()) - return 0; - - for (nickcore_map::const_iterator it = NickCoreList.begin(), it_end = NickCoreList.end(); it != it_end; ++it) - { - NickCore *nc = it->second; - - if (!(u->Account() && u->Account() == nc) && !nc->email.empty() && nc->email.equals_ci(email)) - ++count; - } - - return count; -} - -bool check_email_limit_reached(const Anope::string &email, User *u) -{ - if (NSEmailMax < 1 || email.empty()) - return false; - - if (count_email_in_use(email, u) < NSEmailMax) - return false; - - if (NSEmailMax == 1) - me->NoticeLang(Config->s_NickServ, u, LNG_NSEMAILMAX_REACHED_ONE); - else - me->NoticeLang(Config->s_NickServ, u, LNG_NSEMAILMAX_REACHED, NSEmailMax); - - return true; -} - -void my_load_config() -{ - ConfigReader config; - NSEmailMax = config.ReadInteger("ns_maxemail", "maxemails", "0", 0, false); - Log(LOG_DEBUG) << "[ns_maxemail] NSEmailMax set to " << NSEmailMax; -} - MODULE_INIT(NSMaxEmail) diff --git a/modules/extra/ns_set_misc.cpp b/modules/extra/ns_set_misc.cpp index 2d267f2c4..87c7c05f2 100644 --- a/modules/extra/ns_set_misc.cpp +++ b/modules/extra/ns_set_misc.cpp @@ -29,10 +29,10 @@ class CommandNSSetMisc : public Command if (params.size() > 1) { nc->Extend("nickserv:" + this->name, new ExtensibleItemRegular<Anope::string>(params[1])); - notice_lang(Config->s_NickServ, u, CHAN_SETTING_CHANGED, this->name.c_str(), nc->display.c_str(), params[1].c_str()); + u->SendMessage(NickServ, CHAN_SETTING_CHANGED, this->name.c_str(), nc->display.c_str(), params[1].c_str()); } else - notice_lang(Config->s_NickServ, u, CHAN_SETTING_UNSET, this->name.c_str(), nc->display.c_str()); + u->SendMessage(NickServ, CHAN_SETTING_UNSET, this->name.c_str(), nc->display.c_str()); return MOD_CONT; } @@ -51,7 +51,7 @@ class CommandNSSetMisc : public Command void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SET", NICK_SET_SYNTAX); + SyntaxError(NickServ, u, "SET", NICK_SET_SYNTAX); } void OnServHelp(User *u) @@ -76,7 +76,7 @@ class CommandNSSASetMisc : public CommandNSSetMisc void OnSyntaxError(User *u, const Anope::string &) { - syntax_error(Config->s_NickServ, u, "SASET", NICK_SASET_SYNTAX); + SyntaxError(NickServ, u, "SASET", NICK_SASET_SYNTAX); } }; |