From 2708eea5d13c249143b83fbaa8b552992f0ac8b6 Mon Sep 17 00:00:00 2001 From: Adam- Date: Mon, 4 Jan 2010 05:45:58 +0000 Subject: Removed NICKMAX and CHANMAX, replaced user->nick, c->name, and ci->name with std::string git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2732 5417fbe8-f217-4b02-8779-1006273d7864 --- src/core/bs_act.c | 6 ++-- src/core/bs_assign.c | 2 +- src/core/bs_badwords.c | 22 ++++++------ src/core/bs_bot.c | 6 ++-- src/core/bs_info.c | 6 ++-- src/core/bs_say.c | 6 ++-- src/core/bs_set.c | 24 ++++++------- src/core/bs_unassign.c | 2 +- src/core/cs_access.c | 42 +++++++++++----------- src/core/cs_akick.c | 56 ++++++++++++++--------------- src/core/cs_ban.c | 8 ++--- src/core/cs_clear.c | 4 +-- src/core/cs_drop.c | 6 ++-- src/core/cs_forbid.c | 14 ++++---- src/core/cs_info.c | 4 +-- src/core/cs_invite.c | 6 ++-- src/core/cs_kick.c | 8 ++--- src/core/cs_list.c | 10 +++--- src/core/cs_modes.c | 10 +++--- src/core/cs_register.c | 9 ++--- src/core/cs_set.c | 94 ++++++++++++++++++++++++------------------------ src/core/cs_suspend.c | 20 +++++------ src/core/cs_topic.c | 10 +++--- src/core/cs_unban.c | 4 +-- src/core/cs_xop.c | 30 ++++++++-------- src/core/db_plain.cpp | 12 +++---- src/core/hs_del.c | 2 +- src/core/hs_delall.c | 2 +- src/core/hs_set.c | 4 +-- src/core/hs_setall.c | 4 +-- src/core/ms_cancel.c | 2 +- src/core/ms_check.c | 2 +- src/core/ms_list.c | 4 +-- src/core/ms_read.c | 4 +-- src/core/ms_sendall.c | 2 +- src/core/ns_access.c | 10 +----- src/core/ns_alist.c | 4 +-- src/core/ns_drop.c | 8 ++--- src/core/ns_forbid.c | 8 ++--- src/core/ns_getemail.c | 2 +- src/core/ns_getpass.c | 8 ++--- src/core/ns_ghost.c | 14 ++++---- src/core/ns_group.c | 32 ++++++++--------- src/core/ns_identify.c | 10 +++--- src/core/ns_logout.c | 2 +- src/core/ns_recover.c | 4 +-- src/core/ns_register.c | 40 ++++++++++----------- src/core/ns_release.c | 2 +- src/core/ns_resetpass.c | 6 ++-- src/core/ns_saset.c | 6 ++-- src/core/ns_sendpass.c | 2 +- src/core/ns_set.c | 4 +-- src/core/ns_status.c | 27 ++++++-------- src/core/ns_suspend.c | 12 +++---- src/core/os_akill.c | 16 ++++----- src/core/os_chankill.c | 13 +++---- src/core/os_chanlist.c | 6 ++-- src/core/os_clearmodes.c | 2 +- src/core/os_defcon.c | 8 ++--- src/core/os_global.c | 4 +-- src/core/os_jupe.c | 4 +-- src/core/os_kick.c | 6 ++-- src/core/os_mode.c | 2 +- src/core/os_news.c | 8 ++--- src/core/os_noop.c | 8 ++--- src/core/os_oline.c | 4 +-- src/core/os_quit.c | 4 +-- src/core/os_reload.c | 2 +- src/core/os_restart.c | 4 +-- src/core/os_session.c | 4 +-- src/core/os_set.c | 8 ++--- src/core/os_sgline.c | 4 +-- src/core/os_shutdown.c | 4 +-- src/core/os_sqline.c | 4 +-- src/core/os_staff.c | 2 +- src/core/os_svsnick.c | 8 ++--- src/core/os_szline.c | 4 +-- src/core/os_umode.c | 4 +-- src/core/os_userlist.c | 6 ++-- src/core/ss_main.c | 2 +- 80 files changed, 384 insertions(+), 405 deletions(-) (limited to 'src/core') diff --git a/src/core/bs_act.c b/src/core/bs_act.c index e321c37a9..a22748515 100644 --- a/src/core/bs_act.c +++ b/src/core/bs_act.c @@ -41,7 +41,7 @@ class CommandBSAct : public Command if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -49,10 +49,10 @@ class CommandBSAct : public Command while ((i = message.find_first_of("\001"), i) && i != std::string::npos) message.erase(i, 1); - ircdproto->SendAction(ci->bi, ci->name, "%s", message.c_str()); + ircdproto->SendAction(ci->bi, ci->name.c_str(), "%s", message.c_str()); ci->bi->lastmsg = time(NULL); if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick, ci->name, message.c_str()); + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "ACT %s %s %s", u->nick.c_str(), ci->name.c_str(), message.c_str()); return MOD_CONT; } diff --git a/src/core/bs_assign.c b/src/core/bs_assign.c index 30b7ef647..56912559e 100644 --- a/src/core/bs_assign.c +++ b/src/core/bs_assign.c @@ -62,7 +62,7 @@ class CommandBSAssign : public Command } bi->Assign(u, ci); - notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name); + notice_lang(Config.s_BotServ, u, BOT_ASSIGN_ASSIGNED, bi->nick, ci->name.c_str()); return MOD_CONT; } diff --git a/src/core/bs_badwords.c b/src/core/bs_badwords.c index 06f4eedd0..89de294b8 100644 --- a/src/core/bs_badwords.c +++ b/src/core/bs_badwords.c @@ -28,7 +28,7 @@ class CommandBSBadwords : public Command if (!ci->GetBadWordCount()) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_EMPTY, ci->name.c_str()); return MOD_CONT; } if (!word.empty() && strspn(word.c_str(), "1234567890,-") == word.length()) @@ -48,7 +48,7 @@ class CommandBSBadwords : public Command } } if (!sent_header) - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); return MOD_CONT; } @@ -87,14 +87,14 @@ class CommandBSBadwords : public Command if (!bw->word.empty() && (Config.BSCaseSensitive && !stricmp(bw->word.c_str(), realword.c_str()) || (!Config.BSCaseSensitive && bw->word == realword.c_str()))) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ALREADY_EXISTS, bw->word.c_str(), ci->name.c_str()); return MOD_CONT; } } ci->AddBadWord(realword.c_str(), type); - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_ADDED, realword.c_str(), ci->name.c_str()); return MOD_CONT; } @@ -111,20 +111,20 @@ class CommandBSBadwords : public Command { if (count == 1) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_SUCH_ENTRY, last, ci->name.c_str()); } else { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NO_MATCH, ci->name.c_str()); } } else if (deleted == 1) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_ONE, ci->name.c_str()); } else { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED_SEVERAL, deleted, ci->name.c_str()); } if (deleted) @@ -145,13 +145,13 @@ class CommandBSBadwords : public Command if (i == ci->GetBadWordCount()) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_NOT_FOUND, word.c_str(), ci->name.c_str()); return MOD_CONT; } ci->EraseBadWord(badword); - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_DELETED, badword->word.c_str(), ci->name.c_str()); } return MOD_CONT; @@ -261,7 +261,7 @@ int badwords_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_BADWORDS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } diff --git a/src/core/bs_bot.c b/src/core/bs_bot.c index 2c0195ee4..0d057849e 100644 --- a/src/core/bs_bot.c +++ b/src/core/bs_bot.c @@ -58,7 +58,7 @@ class CommandBSBot : public Command return MOD_CONT; } - for (ch = nick; *ch && (ch - nick) < NICKMAX; ch++) + for (ch = nick; *ch && (ch - nick) < Config.NickLen; ch++) { if (!isvalidnick(*ch)) { @@ -190,7 +190,7 @@ class CommandBSBot : public Command return MOD_CONT; } - for (ch = nick; *ch && (ch - nick) < NICKMAX; ch++) + for (ch = nick; *ch && (ch - nick) < Config.NickLen; ch++) { if (!isvalidnick(*ch)) { @@ -322,7 +322,7 @@ class CommandBSBot : public Command FOREACH_MOD(I_OnBotDelete, OnBotDelete(bi)); - ircdproto->SendQuit(bi, "Quit: Help! I'm being deleted by %s!", u->nick); + ircdproto->SendQuit(bi, "Quit: Help! I'm being deleted by %s!", u->nick.c_str()); ircdproto->SendSQLineDel(bi->nick); delete bi; diff --git a/src/core/bs_info.c b/src/core/bs_info.c index 2f2afb2d8..5cb89c673 100644 --- a/src/core/bs_info.c +++ b/src/core/bs_info.c @@ -30,14 +30,14 @@ class CommandBSInfo : public Command for (i = 0; i < 256; i++) { for (ci = chanlists[i]; ci; ci = ci->next) { if (ci->bi == bi) { - if (strlen(buf) + strlen(ci->name) > 300) { + if (strlen(buf) + strlen(ci->name.c_str()) > 300) { u->SendMessage(Config.s_BotServ, "%s", buf); *buf = 0; end = buf; } end += snprintf(end, sizeof(buf) - (end - buf), " %s ", - ci->name); + ci->name.c_str()); } } } @@ -86,7 +86,7 @@ class CommandBSInfo : public Command return MOD_CONT; } - notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name); + notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_HEADER, ci->name.c_str()); if (ci->bi) notice_lang(Config.s_BotServ, u, BOT_INFO_CHAN_BOT, ci->bi->nick); else diff --git a/src/core/bs_say.c b/src/core/bs_say.c index 7143da298..c1021c79d 100644 --- a/src/core/bs_say.c +++ b/src/core/bs_say.c @@ -45,7 +45,7 @@ class CommandBSSay : public Command if (!ci->c || ci->c->usercount < Config.BSMinUsers) { - notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name); + notice_lang(Config.s_BotServ, u, BOT_NOT_ON_CHANNEL, ci->name.c_str()); return MOD_CONT; } @@ -55,10 +55,10 @@ class CommandBSSay : public Command return MOD_CONT; } - ircdproto->SendPrivmsg(ci->bi, ci->name, "%s", text); + ircdproto->SendPrivmsg(ci->bi, ci->name.c_str(), "%s", text); ci->bi->lastmsg = time(NULL); if (Config.LogBot && Config.LogChannel && LogChan && !debug && findchan(Config.LogChannel)) - ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick, ci->name, text); + ircdproto->SendPrivmsg(ci->bi, Config.LogChannel, "SAY %s %s %s", u->nick.c_str(), ci->name.c_str(), text); return MOD_CONT; } diff --git a/src/core/bs_set.c b/src/core/bs_set.c index 91c69122b..deffc5833 100644 --- a/src/core/bs_set.c +++ b/src/core/bs_set.c @@ -70,11 +70,11 @@ class CommandBSSet : public Command if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKOPS); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_ON, - ci->name); + ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKOPS); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKOPS_OFF, - ci->name); + ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET DONTKICKOPS", BOT_SET_DONTKICKOPS_SYNTAX); @@ -83,11 +83,11 @@ class CommandBSSet : public Command if (value == "ON") { ci->botflags.SetFlag(BS_DONTKICKVOICES); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_ON, - ci->name); + ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_DONTKICKVOICES); notice_lang(Config.s_BotServ, u, BOT_SET_DONTKICKVOICES_OFF, - ci->name); + ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET DONTKICKVOICES", BOT_SET_DONTKICKVOICES_SYNTAX); @@ -95,10 +95,10 @@ class CommandBSSet : public Command } else if (option == "FANTASY") { if (value == "ON") { ci->botflags.SetFlag(BS_FANTASY); - notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_FANTASY); - notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_FANTASY_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET FANTASY", BOT_SET_FANTASY_SYNTAX); @@ -106,10 +106,10 @@ class CommandBSSet : public Command } else if (option == "GREET") { if (value == "ON") { ci->botflags.SetFlag(BS_GREET); - notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_GREET); - notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_GREET_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET GREET", BOT_SET_GREET_SYNTAX); @@ -119,10 +119,10 @@ 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); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_NOBOT); - notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_NOBOT_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET NOBOT", BOT_SET_NOBOT_SYNTAX); @@ -130,10 +130,10 @@ class CommandBSSet : public Command } else if (option == "SYMBIOSIS") { if (value == "ON") { ci->botflags.SetFlag(BS_SYMBIOSIS); - notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_ON, ci->name.c_str()); } else if (value == "OFF") { ci->botflags.UnsetFlag(BS_SYMBIOSIS); - notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name); + notice_lang(Config.s_BotServ, u, BOT_SET_SYMBIOSIS_OFF, ci->name.c_str()); } else { syntax_error(Config.s_BotServ, u, "SET SYMBIOSIS", BOT_SET_SYMBIOSIS_SYNTAX); diff --git a/src/core/bs_unassign.c b/src/core/bs_unassign.c index fcd2ee8f1..1d421fc5d 100644 --- a/src/core/bs_unassign.c +++ b/src/core/bs_unassign.c @@ -39,7 +39,7 @@ class CommandBSUnassign : public Command else { ci->bi->UnAssign(u, ci); - notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name); + notice_lang(Config.s_BotServ, u, BOT_UNASSIGN_UNASSIGNED, ci->name.c_str()); } return MOD_CONT; } diff --git a/src/core/cs_access.c b/src/core/cs_access.c index 5f875b1c9..1b9db83b9 100644 --- a/src/core/cs_access.c +++ b/src/core/cs_access.c @@ -57,7 +57,7 @@ static int access_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -92,7 +92,7 @@ static int access_view(User *u, int index, ChannelInfo *ci, int *sent_header) if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -227,7 +227,7 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, access->level, na->nick, nc->display, ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LEVEL_CHANGED, nc->display, chan, level); return MOD_CONT; } @@ -243,8 +243,8 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name); - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name, level); + alog("%s: %s!%s@%s (level %d) set access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, level, na->nick, nc->display, ci->name.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_ADDED, nc->display, ci->name.c_str(), level); } else if (cmd == "DEL") { @@ -273,18 +273,18 @@ class CommandCSAccess : public Command else if (count == 1) { last = atoi(nick); - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_SUCH_ENTRY, last, ci->name.c_str()); } else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, ci->name.c_str()); } else { - alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); + alog("%s: %s!%s@%s (level %d) deleted access of user%s %s on %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), deleted == 1 ? "" : "s", nick, chan); if (deleted == 1) - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED_SEVERAL, deleted, ci->name.c_str()); } } else @@ -309,8 +309,8 @@ class CommandCSAccess : public Command } else { - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name); - alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_DELETED, access->nc->display, ci->name.c_str()); + alog("%s: %s!%s@%s (level %d) deleted access of %s (group %s) on %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), na->nick, access->nc->display, chan); access->nc = NULL; access->in_use = 0; deleted = 1; @@ -356,7 +356,7 @@ class CommandCSAccess : public Command if (!sent_header) notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); } else if (cmd == "VIEW") { @@ -382,7 +382,7 @@ class CommandCSAccess : public Command if (!sent_header) notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_NO_MATCH, chan); else - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_LIST_FOOTER, ci->name.c_str()); } else if (cmd == "CLEAR") { @@ -402,9 +402,9 @@ class CommandCSAccess : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ACCESS_CLEAR, ci->name.c_str()); alog("%s: %s!%s@%s (level %d) cleared access list on %s", - Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, + Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, get_access(u, ci), chan); } @@ -474,8 +474,8 @@ class CommandCSLevels : public Command ci->levels[levelinfo[i].what] = level; alog("%s: %s!%s@%s set level %s on channel %s to %d", - Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, - levelinfo[i].name, ci->name, level); + Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, + levelinfo[i].name, ci->name.c_str(), level); notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_CHANGED, levelinfo[i].name, chan, level); return MOD_CONT; @@ -490,8 +490,8 @@ class CommandCSLevels : public Command ci->levels[levelinfo[i].what] = ACCESS_INVALID; alog("%s: %s!%s@%s disabled level %s on channel %s", - Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, - levelinfo[i].name, ci->name); + Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, + levelinfo[i].name, ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_DISABLED, levelinfo[i].name, chan); return MOD_CONT; @@ -537,7 +537,7 @@ class CommandCSLevels : public Command reset_levels(ci); alog("%s: %s!%s@%s reset levels definitions on channel %s", - Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ci->name); + Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_LEVELS_RESET, chan); } else { this->OnSyntaxError(u, ""); diff --git a/src/core/cs_akick.c b/src/core/cs_akick.c index fcc335cb8..625e226c6 100644 --- a/src/core/cs_akick.c +++ b/src/core/cs_akick.c @@ -68,7 +68,7 @@ int akick_list(User * u, int index, ChannelInfo * ci, int *sent_header) if (!akick->InUse) return 0; if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -98,7 +98,7 @@ int akick_view(User * u, int index, ChannelInfo * ci, int *sent_header) if (!akick->InUse) return 0; if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_HEADER, ci->name.c_str()); *sent_header = 1; } @@ -174,7 +174,7 @@ class CommandCSAKick : public Command { if (is_excepted_mask(ci, mask.c_str())) { - notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, mask.c_str(), ci->name.c_str()); return; } } @@ -239,7 +239,7 @@ class CommandCSAKick : public Command continue; if ((akick->HasFlag(AK_ISNICK)) ? akick->nc == nc : akick->mask == mask) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS, (akick->HasFlag(AK_ISNICK)) ? akick->nc->display : akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ALREADY_EXISTS, (akick->HasFlag(AK_ISNICK)) ? akick->nc->display : akick->mask.c_str(), ci->name.c_str()); return; } } @@ -256,7 +256,7 @@ class CommandCSAKick : public Command else akick = ci->AddAkick(u->nick, mask.c_str(), !reason.empty() ? reason.c_str() : ""); - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ADDED, mask.c_str(), ci->name.c_str()); this->DoEnforce(u, ci, params); } @@ -271,7 +271,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -290,12 +290,12 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } akick->SetFlag(AK_STUCK); - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_STUCK, akick->mask.c_str(), ci->name.c_str()); if (ci->c) stick_mask(ci, akick); @@ -311,7 +311,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -330,12 +330,12 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } akick->UnsetFlag(AK_STUCK); - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_UNSTUCK, akick->mask.c_str(), ci->name.c_str()); } void DoDel(User *u, ChannelInfo *ci, const std::vector ¶ms) @@ -346,7 +346,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -360,14 +360,14 @@ class CommandCSAKick : public Command if (!deleted) { if (count == 1) - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY, last, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_SUCH_ENTRY, last, ci->name.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } else if (deleted == 1) - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_ONE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_ONE, ci->name.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL, deleted, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED_SEVERAL, deleted, ci->name.c_str()); if (deleted) ci->CleanAkick(); } @@ -390,13 +390,13 @@ class CommandCSAKick : public Command if (i == ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NOT_FOUND, mask.c_str(), ci->name.c_str()); return; } ci->EraseAkick(akick); - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_DELETED, mask.c_str(), ci->name.c_str()); } } @@ -409,7 +409,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -435,7 +435,7 @@ class CommandCSAKick : public Command } if (!sent_header) - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } @@ -448,7 +448,7 @@ class CommandCSAKick : public Command if (!ci->GetAkickCount()) { - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_LIST_EMPTY, ci->name.c_str()); return; } @@ -473,7 +473,7 @@ class CommandCSAKick : public Command } } if (!sent_header) - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_NO_MATCH, ci->name.c_str()); } @@ -486,7 +486,7 @@ class CommandCSAKick : public Command if (!c) { - notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_X_NOT_IN_USE, ci->name.c_str()); return; } @@ -495,10 +495,10 @@ class CommandCSAKick : public Command while (cu) { unext = cu->next; - if (check_kick(cu->user, c->name, c->creation_time)) + if (check_kick(cu->user, c->name.c_str(), c->creation_time)) { - argv[0] = sstrdup(c->name); - argv[1] = sstrdup(cu->user->nick); + argv[0] = sstrdup(c->name.c_str()); + argv[1] = sstrdup(cu->user->nick.c_str()); argv[2] = sstrdup(Config.CSAutokickReason); do_kick(Config.s_ChanServ, 3, argv); @@ -511,13 +511,13 @@ class CommandCSAKick : public Command cu = unext; } - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name, count); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_ENFORCE_DONE, ci->name.c_str(), count); } void DoClear(User *u, ChannelInfo *ci, const std::vector ¶ms) { ci->ClearAkick(); - notice_lang(Config.s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_AKICK_CLEAR, ci->name.c_str()); } public: diff --git a/src/core/cs_ban.c b/src/core/cs_ban.c index 62d69724e..aaf36ac27 100644 --- a/src/core/cs_ban.c +++ b/src/core/cs_ban.c @@ -42,7 +42,7 @@ class CommandCSBan : public Command if (!reason) reason = "Requested"; - is_same = (stricmp(target, u->nick) == 0); + is_same = (stricmp(target, u->nick.c_str()) == 0); if (c) ci = c->ci; @@ -62,7 +62,7 @@ class CommandCSBan : public Command * 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, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EXCEPTED, u2->nick.c_str(), ci->name.c_str()); } else if (is_protected(u2)) { notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); } else { @@ -78,12 +78,12 @@ class CommandCSBan : public Command if ((ci->HasFlag(CI_SIGNKICK)) || ((ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(u, ci, CA_SIGNKICK))) - ircdproto->SendKick(whosends(ci), ci->c, u2, "%s (%s)", reason, u->nick); + ircdproto->SendKick(whosends(ci), ci->c, u2, "%s (%s)", reason, u->nick.c_str()); else ircdproto->SendKick(whosends(ci), ci->c, u2, "%s", reason); const char *kav[4]; - kav[0] = ci->name; + kav[0] = ci->name.c_str(); kav[1] = target; kav[2] = reason; do_kick(Config.s_ChanServ, 3, kav); diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c index cc8208829..1de6ca1ff 100644 --- a/src/core/cs_clear.c +++ b/src/core/cs_clear.c @@ -152,12 +152,12 @@ class CommandCSClear : public Command struct c_userlist *cu, *bnext; char buf[256]; - snprintf(buf, sizeof(buf), "CLEAR USERS command from %s", u->nick); + snprintf(buf, sizeof(buf), "CLEAR USERS command from %s", u->nick.c_str()); for (cu = c->users; cu; cu = bnext) { bnext = cu->next; av[0] = sstrdup(chan); - av[1] = sstrdup(cu->user->nick); + av[1] = sstrdup(cu->user->nick.c_str()); av[2] = sstrdup(buf); ircdproto->SendKick(whosends(ci), c, cu->user, av[2]); do_kick(Config.s_ChanServ, 3, av); diff --git a/src/core/cs_drop.c b/src/core/cs_drop.c index 82ffc2a1f..1cc1949d5 100644 --- a/src/core/cs_drop.c +++ b/src/core/cs_drop.c @@ -67,11 +67,11 @@ class CommandCSDrop : public Command if (ircd->chansqline && (ci->HasFlag(CI_FORBIDDEN))) { - ircdproto->SendSQLineDel(ci->name); + ircdproto->SendSQLineDel(ci->name.c_str()); } alog("%s: Channel %s dropped by %s!%s@%s (founder: %s)", - Config.s_ChanServ, ci->name, u->nick, u->GetIdent().c_str(), + Config.s_ChanServ, ci->name.c_str(), u->nick.c_str(), u->GetIdent().c_str(), u->host, (ci->founder ? ci->founder->display : "(none)")); delete ci; @@ -81,7 +81,7 @@ class CommandCSDrop : public Command */ if (Config.WallDrop) { if ((level < ACCESS_FOUNDER) || (!IsRealFounder(u, ci) && ci->HasFlag(CI_SECUREFOUNDER))) - ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used DROP on channel \2%s\2", u->nick, chan); + ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used DROP on channel \2%s\2", u->nick.c_str(), chan); } notice_lang(Config.s_ChanServ, u, CHAN_DROPPED, chan); diff --git a/src/core/cs_forbid.c b/src/core/cs_forbid.c index ae298d8d3..82b045b48 100644 --- a/src/core/cs_forbid.c +++ b/src/core/cs_forbid.c @@ -55,17 +55,17 @@ class CommandCSForbid : public Command ci = new ChannelInfo(chan); if (!ci) { - alog("%s: Valid FORBID for %s by %s failed", Config.s_ChanServ, ci->name, u->nick); + alog("%s: Valid FORBID for %s by %s failed", Config.s_ChanServ, ci->name.c_str(), u->nick.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_FORBID_FAILED, chan); return MOD_CONT; } ci->SetFlag(CI_FORBIDDEN); - ci->forbidby = sstrdup(u->nick); + ci->forbidby = sstrdup(u->nick.c_str()); if (reason) ci->forbidreason = sstrdup(reason); - if ((c = findchan(ci->name))) + if ((c = findchan(ci->name.c_str()))) { struct c_userlist *cu, *nextu; const char *av[3]; @@ -82,8 +82,8 @@ class CommandCSForbid : public Command if (is_oper(cu->user)) continue; - av[0] = c->name; - av[1] = cu->user->nick; + av[0] = c->name.c_str(); + av[1] = cu->user->nick.c_str(); av[2] = reason ? reason : getstring(cu->user->nc, CHAN_FORBID_REASON); ircdproto->SendKick(findbot(Config.s_ChanServ), c, cu->user, av[2]); do_kick(Config.s_ChanServ, 3, av); @@ -91,14 +91,14 @@ class CommandCSForbid : public Command } if (Config.WallForbid) - ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used FORBID on channel \2%s\2", u->nick, ci->name); + ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used FORBID on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); if (ircd->chansqline) { ircdproto->SendSQLine(ci->name, reason ? reason : "Forbidden"); } - alog("%s: %s set FORBID for channel %s", Config.s_ChanServ, u->nick, ci->name); + alog("%s: %s set FORBID for channel %s", Config.s_ChanServ, u->nick.c_str(), ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_FORBID_SUCCEEDED, chan); FOREACH_MOD(I_OnChanForbidden, OnChanForbidden(ci)); diff --git a/src/core/cs_info.c b/src/core/cs_info.c index 3a74f0e06..ec6245d5e 100644 --- a/src/core/cs_info.c +++ b/src/core/cs_info.c @@ -89,7 +89,7 @@ class CommandCSInfo : public Command && (!ci->c || !(ci->c->HasMode(CMODE_SECRET))))) { notice_lang(Config.s_ChanServ, u, CHAN_INFO_LAST_TOPIC, ci->last_topic); - notice_lang(Config.s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter); + notice_lang(Config.s_ChanServ, u, CHAN_INFO_TOPIC_SET_BY, ci->last_topic_setter.c_str()); } if (ci->entry_message && show_all) @@ -145,7 +145,7 @@ class CommandCSInfo : public Command } if (!show_all && (check_access(u, ci, CA_INFO) || has_auspex)) - notice_lang(Config.s_ChanServ, u, NICK_INFO_FOR_MORE, Config.s_ChanServ, ci->name); + notice_lang(Config.s_ChanServ, u, NICK_INFO_FOR_MORE, Config.s_ChanServ, ci->name.c_str()); return MOD_CONT; } diff --git a/src/core/cs_invite.c b/src/core/cs_invite.c index 42278bb14..fe8d4f6f3 100644 --- a/src/core/cs_invite.c +++ b/src/core/cs_invite.c @@ -55,11 +55,11 @@ class CommandCSInvite : public Command } if (is_on_chan(c, u2)) - notice_lang(Config.s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name); + notice_lang(Config.s_ChanServ, u, CHAN_INVITE_ALREADY_IN, c->name.c_str()); else { - ircdproto->SendInvite(whosends(ci), chan, u2->nick); - notice_lang(Config.s_ChanServ, u, CHAN_INVITE_SUCCESS, c->name); + ircdproto->SendInvite(whosends(ci), chan, u2->nick.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_INVITE_SUCCESS, c->name.c_str()); } return MOD_CONT; } diff --git a/src/core/cs_kick.c b/src/core/cs_kick.c index 93d42620a..898fb898b 100644 --- a/src/core/cs_kick.c +++ b/src/core/cs_kick.c @@ -43,7 +43,7 @@ class CommandCSKick : public Command reason = "Requested"; } - is_same = (target == u->nick) ? 1 : (stricmp(target, u->nick) == 0); + is_same = (target == u->nick.c_str()) ? 1 : (stricmp(target, u->nick.c_str()) == 0); if (c) ci = c->ci; @@ -53,7 +53,7 @@ class CommandCSKick : public Command } else if (is_same ? !(u2 = u) : !(u2 = finduser(target))) { notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, target); } else if (!is_on_chan(c, u2)) { - notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.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); @@ -69,10 +69,10 @@ class CommandCSKick : public Command || ((ci->HasFlag(CI_SIGNKICK_LEVEL)) && !check_access(u, ci, CA_SIGNKICK))) ircdproto->SendKick(whosends(ci), ci->c, u2, "%s (%s)", - reason, u->nick); + reason, u->nick.c_str()); else ircdproto->SendKick(whosends(ci), ci->c, u2, "%s", reason); - av[0] = ci->name; + av[0] = ci->name.c_str(); av[1] = target; av[2] = reason; do_kick(Config.s_ChanServ, 3, av); diff --git a/src/core/cs_list.c b/src/core/cs_list.c index 7b83d6d9a..c13e2f9ef 100644 --- a/src/core/cs_list.c +++ b/src/core/cs_list.c @@ -126,8 +126,8 @@ public: else if (channoexpire && !ci->HasFlag(CI_NO_EXPIRE)) continue; - if ((stricmp(pattern, ci->name) == 0) - || (stricmp(spattern, ci->name) == 0) + if ((stricmp(pattern, ci->name.c_str()) == 0) + || (stricmp(spattern, ci->name.c_str()) == 0) || Anope::Match(ci->name, pattern, false) || Anope::Match(ci->name, spattern, false)) { @@ -142,17 +142,17 @@ public: if (ci->HasFlag(CI_FORBIDDEN)) { snprintf(buf, sizeof(buf), - "%-20s [Forbidden]", ci->name); + "%-20s [Forbidden]", ci->name.c_str()); } else if (ci->HasFlag(CI_SUSPENDED)) { snprintf(buf, sizeof(buf), - "%-20s [Suspended]", ci->name); + "%-20s [Suspended]", ci->name.c_str()); } else { snprintf(buf, sizeof(buf), "%-20s %s", - ci->name, ci->desc ? ci->desc : ""); + ci->name.c_str(), ci->desc ? ci->desc : ""); } u->SendMessage(Config.s_ChanServ, " %c%s", noexpire_char, buf); diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c index 9dc76e10f..d696d641c 100644 --- a/src/core/cs_modes.c +++ b/src/core/cs_modes.c @@ -35,9 +35,9 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c int is_same; if (!nick) - nick = u->nick; + nick = u->nick.c_str(); - is_same = (nick == u->nick) ? 1 : (stricmp(nick, u->nick) == 0); + is_same = (nick == u->nick) ? 1 : (stricmp(nick, u->nick.c_str()) == 0); if (c) ci = c->ci; @@ -47,7 +47,7 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c else if (is_same ? !(u2 = u) : !(u2 = finduser(nick))) notice_lang(Config.s_ChanServ, u, NICK_X_NOT_IN_USE, nick); else if (!is_on_chan(c, u2)) - notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick, c->name); + notice_lang(Config.s_ChanServ, u, NICK_X_NOT_ON_CHAN, u2->nick.c_str(), c->name.c_str()); else if (is_same ? !check_access(u, ci, levelself) : !check_access(u, ci, level)) notice_lang(Config.s_ChanServ, u, ACCESS_DENIED); else if (!set && !is_same && (ci->HasFlag(CI_PEACE)) && (get_access(u2, ci) >= get_access(u, ci))) @@ -62,8 +62,8 @@ static CommandReturn do_util(User *u, ChannelMode *cm, const char *chan, const c c->RemoveMode(NULL, cm, u2->nick); if (notice && ci->HasFlag(notice)) - ircdproto->SendMessage(whosends(ci), c->name, "%s command used for %s by %s", - name.c_str(), u2->nick, u->nick); + ircdproto->SendMessage(whosends(ci), c->name.c_str(), "%s command used for %s by %s", + name.c_str(), u2->nick.c_str(), u->nick.c_str()); } return MOD_CONT; diff --git a/src/core/cs_register.c b/src/core/cs_register.c index fd4c38f70..7e59b0c26 100644 --- a/src/core/cs_register.c +++ b/src/core/cs_register.c @@ -68,15 +68,16 @@ class CommandCSRegister : public Command if (c->topic) { ci->last_topic = sstrdup(c->topic); - strscpy(ci->last_topic_setter, c->topic_setter, NICKMAX); + ci->last_topic_setter = c->topic_setter; ci->last_topic_time = c->topic_time; } - else strscpy(ci->last_topic_setter, Config.s_ChanServ, NICKMAX); /* Set this to something, otherwise it will maliform the topic */ + else + ci->last_topic_setter = Config.s_ChanServ; ci->bi = NULL; ++ci->founder->channelcount; - alog("%s: Channel '%s' registered by %s!%s@%s", Config.s_ChanServ, chan, u->nick, u->GetIdent().c_str(), u->host); - notice_lang(Config.s_ChanServ, u, CHAN_REGISTERED, chan, u->nick); + alog("%s: Channel '%s' registered by %s!%s@%s", Config.s_ChanServ, chan, u->nick.c_str(), u->GetIdent().c_str(), u->host); + notice_lang(Config.s_ChanServ, u, CHAN_REGISTERED, chan, u->nick.c_str()); /* Implement new mode lock */ check_modes(c); diff --git a/src/core/cs_set.c b/src/core/cs_set.c index d2c2d6845..0d409472f 100644 --- a/src/core/cs_set.c +++ b/src/core/cs_set.c @@ -43,7 +43,7 @@ class CommandCSSet : public Command } alog("%s: Changing founder of %s from %s to %s by %s!%s@%s", - Config.s_ChanServ, ci->name, ci->founder->display, nc->display, u->nick, + Config.s_ChanServ, ci->name.c_str(), ci->founder->display, nc->display, u->nick.c_str(), u->GetIdent().c_str(), u->host); /* Founder and successor must not be the same group */ @@ -54,7 +54,7 @@ class CommandCSSet : public Command ci->founder = nc; nc->channelcount++; - notice_lang(Config.s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_FOUNDER_CHANGED, ci->name.c_str(), param.c_str()); return MOD_CONT; } @@ -79,7 +79,7 @@ class CommandCSSet : public Command } if (na->nc == ci->founder) { - notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param.c_str(), ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_IS_FOUNDER, param.c_str(), ci->name.c_str()); return MOD_CONT; } nc = na->nc; @@ -89,16 +89,16 @@ class CommandCSSet : public Command nc = NULL; alog("%s: Changing successor of %s from %s to %s by %s!%s@%s", - Config.s_ChanServ, ci->name, + Config.s_ChanServ, ci->name.c_str(), (ci->successor ? ci->successor->display : "none"), - (nc ? nc->display : "none"), u->nick, u->GetIdent().c_str(), u->host); + (nc ? nc->display : "none"), u->nick.c_str(), u->GetIdent().c_str(), u->host); ci->successor = nc; if (nc) - notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_CHANGED, ci->name.c_str(), param.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SUCCESSOR_UNSET, ci->name.c_str()); return MOD_CONT; } @@ -108,7 +108,7 @@ class CommandCSSet : public Command if (ci->desc) delete [] ci->desc; ci->desc = sstrdup(param.c_str()); - notice_lang(Config.s_ChanServ, u, CHAN_DESC_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_DESC_CHANGED, ci->name.c_str(), param.c_str()); return MOD_CONT; } @@ -119,12 +119,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->url = sstrdup(param.c_str()); - notice_lang(Config.s_ChanServ, u, CHAN_URL_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_URL_CHANGED, ci->name.c_str(), param.c_str()); } else { ci->url = NULL; - notice_lang(Config.s_ChanServ, u, CHAN_URL_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_URL_UNSET, ci->name.c_str()); } return MOD_CONT; } @@ -136,12 +136,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->email = sstrdup(param.c_str()); - notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_CHANGED, ci->name.c_str(), param.c_str()); } else { ci->email = NULL; - notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_EMAIL_UNSET, ci->name.c_str()); } return MOD_CONT; } @@ -153,12 +153,12 @@ class CommandCSSet : public Command if (!param.empty()) { ci->entry_message = sstrdup(param.c_str()); - notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name, param.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_CHANGED, ci->name.c_str(), param.c_str()); } else { ci->entry_message = NULL; - notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_ENTRY_MSG_UNSET, ci->name.c_str()); } return MOD_CONT; } @@ -259,7 +259,7 @@ class CommandCSSet : public Command * mode lock at all. */ if (get_mlock_modes(ci, 0)) { - notice_lang(Config.s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name, + notice_lang(Config.s_ChanServ, u, CHAN_MLOCK_CHANGED, ci->name.c_str(), get_mlock_modes(ci, 0)); } @@ -279,7 +279,7 @@ class CommandCSSet : public Command notice_lang(Config.s_ChanServ, u, CHAN_SET_BANTYPE_INVALID, param); } else { ci->bantype = bantype; - notice_lang(Config.s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name, + notice_lang(Config.s_ChanServ, u, CHAN_SET_BANTYPE_CHANGED, ci->name.c_str(), ci->bantype); } return MOD_CONT; @@ -290,12 +290,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_KEEPTOPIC); - notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_KEEPTOPIC); - notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_KEEPTOPIC_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "KEEPTOPIC"); @@ -308,12 +308,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_TOPICLOCK); - notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_TOPICLOCK); - notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_TOPICLOCK_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "TOPICLOCK"); @@ -326,12 +326,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_PRIVATE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_PRIVATE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PRIVATE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PRIVATE"); @@ -344,12 +344,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECUREOPS); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_SECUREOPS); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREOPS_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECUREOPS"); @@ -362,12 +362,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECUREFOUNDER); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_SECUREFOUNDER); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECUREFOUNDER_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECUREFOUNDER"); @@ -382,14 +382,14 @@ class CommandCSSet : 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); + notice_lang(Config.s_ChanServ, u, CHAN_SET_RESTRICTED_ON, ci->name.c_str()); } else if (param == "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); + notice_lang(Config.s_ChanServ, u, CHAN_SET_RESTRICTED_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "RESTRICTED"); @@ -402,12 +402,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_SECURE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_SECURE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SECURE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SECURE"); @@ -421,19 +421,19 @@ class CommandCSSet : public Command { ci->SetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_ON, ci->name.c_str()); } else if (param == "LEVEL") { ci->SetFlag(CI_SIGNKICK_LEVEL); ci->UnsetFlag(CI_SIGNKICK); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_LEVEL, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_SIGNKICK); ci->UnsetFlag(CI_SIGNKICK_LEVEL); - notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_SIGNKICK_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "SIGNKICK"); @@ -446,12 +446,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_OPNOTICE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_OPNOTICE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_OPNOTICE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "OPNOTICE"); @@ -500,17 +500,17 @@ class CommandCSSet : public Command ci->SetFlag(CI_XOP); } - alog("%s: %s!%s@%s enabled XOP for %s", Config.s_ChanServ, u->nick, - u->GetIdent().c_str(), u->host, ci->name); - notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_ON, ci->name); + alog("%s: %s!%s@%s enabled XOP for %s", Config.s_ChanServ, u->nick.c_str(), + u->GetIdent().c_str(), u->host, ci->name.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_XOP); - alog("%s: %s!%s@%s disabled XOP for %s", Config.s_ChanServ, u->nick, - u->GetIdent().c_str(), u->host, ci->name); - notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name); + alog("%s: %s!%s@%s disabled XOP for %s", Config.s_ChanServ, u->nick.c_str(), + u->GetIdent().c_str(), u->host, ci->name.c_str()); + notice_lang(Config.s_ChanServ, u, CHAN_SET_XOP_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "XOP"); @@ -525,12 +525,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_PEACE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_PEACE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PEACE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PEACE"); @@ -572,7 +572,7 @@ class CommandCSSet : public Command } } - notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_ON, ci->name.c_str()); } else if (param == "OFF") { @@ -599,7 +599,7 @@ class CommandCSSet : public Command delete ci->c; } - notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_PERSIST_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "PERSIST"); @@ -617,12 +617,12 @@ class CommandCSSet : public Command if (param == "ON") { ci->SetFlag(CI_NO_EXPIRE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_ON, ci->name.c_str()); } else if (param == "OFF") { ci->UnsetFlag(CI_NO_EXPIRE); - notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name); + notice_lang(Config.s_ChanServ, u, CHAN_SET_NOEXPIRE_OFF, ci->name.c_str()); } else this->OnSyntaxError(u, "NOEXPIRE"); diff --git a/src/core/cs_suspend.c b/src/core/cs_suspend.c index 8976ba745..fdd40c796 100644 --- a/src/core/cs_suspend.c +++ b/src/core/cs_suspend.c @@ -56,11 +56,11 @@ class CommandCSSuspend : public Command if (ci) { ci->SetFlag(CI_SUSPENDED); - ci->forbidby = sstrdup(u->nick); + ci->forbidby = sstrdup(u->nick.c_str()); if (reason) ci->forbidreason = sstrdup(reason); - if ((c = findchan(ci->name))) + if ((c = findchan(ci->name.c_str()))) { struct c_userlist *cu, *nextu; const char *av[3]; @@ -72,8 +72,8 @@ class CommandCSSuspend : public Command if (is_oper(cu->user)) continue; - av[0] = c->name; - av[1] = cu->user->nick; + av[0] = c->name.c_str(); + av[1] = cu->user->nick.c_str(); av[2] = reason ? reason : getstring(cu->user->nc, CHAN_SUSPEND_REASON); ircdproto->SendKick(findbot(Config.s_ChanServ), c, cu->user, av[2]); do_kick(Config.s_ChanServ, 3, av); @@ -81,16 +81,16 @@ class CommandCSSuspend : public Command } if (Config.WallForbid) - ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used SUSPEND on channel \2%s\2", u->nick, ci->name); + ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used SUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - alog("%s: %s set SUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name); + alog("%s: %s set SUSPEND for channel %s", Config.s_ChanServ, u->nick.c_str(), ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_SUSPEND_SUCCEEDED, chan); FOREACH_MOD(I_OnChanSuspend, OnChanSuspend(ci)); } else { - alog("%s: Valid SUSPEND for %s by %s failed", Config.s_ChanServ, ci->name, u->nick); + alog("%s: Valid SUSPEND for %s by %s failed", Config.s_ChanServ, ci->name.c_str(), u->nick.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_SUSPEND_FAILED, chan); } return MOD_CONT; @@ -151,16 +151,16 @@ class CommandCSUnSuspend : public Command } if (Config.WallForbid) - ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick, ci->name); + ircdproto->SendGlobops(findbot(Config.s_ChanServ), "\2%s\2 used UNSUSPEND on channel \2%s\2", u->nick.c_str(), ci->name.c_str()); - alog("%s: %s set UNSUSPEND for channel %s", Config.s_ChanServ, u->nick, ci->name); + alog("%s: %s set UNSUSPEND for channel %s", Config.s_ChanServ, u->nick.c_str(), ci->name.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_SUCCEEDED, chan); FOREACH_MOD(I_OnChanUnsuspend, OnChanUnsuspend(ci)); } else { - alog("%s: Valid UNSUSPEND for %s by %s failed", Config.s_ChanServ, chan, u->nick); + alog("%s: Valid UNSUSPEND for %s by %s failed", Config.s_ChanServ, chan, u->nick.c_str()); notice_lang(Config.s_ChanServ, u, CHAN_UNSUSPEND_FAILED, chan); } return MOD_CONT; diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c index 2da85af64..6acf09756 100644 --- a/src/core/cs_topic.c +++ b/src/core/cs_topic.c @@ -42,26 +42,26 @@ class CommandCSTopic : public Command if (ci->last_topic) delete [] ci->last_topic; ci->last_topic = topic ? sstrdup(topic) : NULL; - strscpy(ci->last_topic_setter, u->nick, NICKMAX); + ci->last_topic_setter = u->nick; ci->last_topic_time = time(NULL); if (c->topic) delete [] c->topic; c->topic = topic ? sstrdup(topic) : NULL; - strscpy(c->topic_setter, u->nick, NICKMAX); + c->topic_setter = u->nick; if (ircd->topictsbackward) c->topic_time = c->topic_time - 1; else c->topic_time = ci->last_topic_time; if (!check_access(u, ci, CA_TOPIC)) - alog("%s: %s!%s@%s changed topic of %s as services admin.", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, c->name); + alog("%s: %s!%s@%s changed topic of %s as services admin.", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, c->name.c_str()); if (ircd->join2set && whosends(ci) == findbot(Config.s_ChanServ)) { - ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name, c->creation_time); + ircdproto->SendJoin(findbot(Config.s_ChanServ), c->name.c_str(), c->creation_time); ircdproto->SendMode(NULL, c, "+o %s", Config.s_ChanServ); } - ircdproto->SendTopic(whosends(ci), c, u->nick, topic ? topic : ""); + ircdproto->SendTopic(whosends(ci), c, u->nick.c_str(), topic ? topic : ""); if (ircd->join2set && whosends(ci) == findbot(Config.s_ChanServ)) ircdproto->SendPart(findbot(Config.s_ChanServ), c, NULL); } diff --git a/src/core/cs_unban.c b/src/core/cs_unban.c index 2217bfa07..e25df3c8b 100644 --- a/src/core/cs_unban.c +++ b/src/core/cs_unban.c @@ -52,9 +52,9 @@ class CommandCSUnban : public Command common_unban(c->ci, u2->nick); if (u2 == u) - notice_lang(Config.s_ChanServ, u, CHAN_UNBANNED, c->name); + notice_lang(Config.s_ChanServ, u, CHAN_UNBANNED, c->name.c_str()); else - notice_lang(Config.s_ChanServ, u, CHAN_UNBANNED_OTHER, u2->nick, c->name); + notice_lang(Config.s_ChanServ, u, CHAN_UNBANNED_OTHER, u2->nick.c_str(), c->name.c_str()); return MOD_CONT; } diff --git a/src/core/cs_xop.c b/src/core/cs_xop.c index 01e84edac..ac2fea3f5 100644 --- a/src/core/cs_xop.c +++ b/src/core/cs_xop.c @@ -189,17 +189,17 @@ class XOPBase : public Command access->creator = u->nick; } - alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick, u->GetIdent().c_str(), u->host, ulev, change ? "changed" : "set", level, na->nick, nc->display, ci->name); + alog("%s: %s!%s@%s (level %d) %s access level %d to %s (group %s) on channel %s", Config.s_ChanServ, u->nick.c_str(), u->GetIdent().c_str(), u->host, ulev, change ? "changed" : "set", level, na->nick, nc->display, ci->name.c_str()); if (!change) { FOREACH_MOD(I_OnAccessAdd, OnAccessAdd(ci, u, na->nick, level)); - notice_lang(Config.s_ChanServ, u, messages[XOP_ADDED], nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_ADDED], nc->display, ci->name.c_str()); } else { FOREACH_MOD(I_OnAccessChange, OnAccessChange(ci, u, na->nick, level)); - notice_lang(Config.s_ChanServ, u, messages[XOP_MOVED], nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_MOVED], nc->display, ci->name.c_str()); } return MOD_CONT; @@ -226,7 +226,7 @@ class XOPBase : public Command if (!ci->GetAccessCount()) { - notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } @@ -250,15 +250,15 @@ class XOPBase : public Command else if (count == 1) { last = atoi(nick); - notice_lang(Config.s_ChanServ, u, messages[XOP_NO_SUCH_ENTRY], last, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_SUCH_ENTRY], last, ci->name.c_str()); } else - notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name.c_str()); } else if (deleted == 1) - notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_ONE], ci->name.c_str()); else - notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_SEVERAL], deleted, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED_SEVERAL], deleted, ci->name.c_str()); } else { @@ -273,7 +273,7 @@ class XOPBase : public Command if (!access) { - notice_lang(Config.s_ChanServ, u, messages[XOP_NOT_FOUND], nick, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NOT_FOUND], nick, ci->name.c_str()); return MOD_CONT; } @@ -284,7 +284,7 @@ class XOPBase : public Command } else { - notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED], access->nc->display, ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_DELETED], access->nc->display, ci->name.c_str()); access->nc = NULL; access->in_use = 0; @@ -317,7 +317,7 @@ class XOPBase : public Command if (!ci->GetAccessCount()) { - notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } @@ -334,7 +334,7 @@ class XOPBase : public Command } } if (!sent_header) - notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_NO_MATCH], ci->name.c_str()); return MOD_CONT; } @@ -349,7 +349,7 @@ class XOPBase : public Command if (!ci->GetAccessCount()) { - notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_LIST_EMPTY], ci->name.c_str()); return MOD_CONT; } @@ -368,7 +368,7 @@ class XOPBase : public Command FOREACH_MOD(I_OnAccessClear, OnAccessClear(ci, u)); - notice_lang(Config.s_ChanServ, u, messages[XOP_CLEAR], ci->name); + notice_lang(Config.s_ChanServ, u, messages[XOP_CLEAR], ci->name.c_str()); return MOD_CONT; } @@ -609,7 +609,7 @@ int xop_list(User *u, int index, ChannelInfo *ci, int *sent_header, int xlev, in if (!*sent_header) { - notice_lang(Config.s_ChanServ, u, xmsg, ci->name); + notice_lang(Config.s_ChanServ, u, xmsg, ci->name.c_str()); *sent_header = 1; } diff --git a/src/core/db_plain.cpp b/src/core/db_plain.cpp index 5862e679c..0f4d6ccb5 100644 --- a/src/core/db_plain.cpp +++ b/src/core/db_plain.cpp @@ -456,7 +456,7 @@ static void LoadChanInfo(const std::vector ¶ms) ci->memos.memomax = atoi(params[4].c_str()); if (debug > 1) - alog("[db_plain]: loaded channel %s", ci->name); + alog("[db_plain]: loaded channel %s", ci->name.c_str()); } static void LoadOperInfo(const std::vector ¶ms) @@ -486,7 +486,7 @@ static void LoadOperInfo(const std::vector ¶ms) exceptions = static_cast(srealloc(exceptions, sizeof(Exception) * nexceptions)); exceptions[nexceptions - 1].mask = sstrdup(params[1].c_str()); exceptions[nexceptions - 1].