From 97467cb2c85832c10da11364e0517ed3c4453ddb Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 13 Dec 2010 13:26:01 -0500 Subject: Bug #1113 - Document the fantasy character in /bs help --- modules/core/bs_help.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules') diff --git a/modules/core/bs_help.cpp b/modules/core/bs_help.cpp index 43fb59c92..68169cdc8 100644 --- a/modules/core/bs_help.cpp +++ b/modules/core/bs_help.cpp @@ -36,7 +36,7 @@ class CommandBSHelp : public Command 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(source); - source.Reply(BOT_HELP_FOOTER, Config->BSMinUsers); + source.Reply(BOT_HELP_FOOTER, Config->BSMinUsers, Config->s_ChanServ.c_str(), Config->BSFantasyCharacter[0]); } }; -- cgit From 49d3c97b677f319460146803004066dfd3d19089 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 13 Dec 2010 16:36:36 -0500 Subject: Bug #1079 - Don't use users real host and IPs when matching against bans and excepts, except when a user is unbanning themselves, in an attempt to prevent people from gaining other users IPs. This removes support for Unreal and Bahamuts SVSMode -b because it will unban users by real host and IP. --- modules/core/cs_unban.cpp | 2 +- modules/protocol/bahamut.cpp | 7 ------- modules/protocol/inspircd11.cpp | 1 - modules/protocol/inspircd12.cpp | 1 - modules/protocol/inspircd20.cpp | 1 - modules/protocol/plexus.cpp | 1 - modules/protocol/ratbox.cpp | 1 - modules/protocol/unreal32.cpp | 7 ------- 8 files changed, 1 insertion(+), 20 deletions(-) (limited to 'modules') diff --git a/modules/core/cs_unban.cpp b/modules/core/cs_unban.cpp index df5d2877e..4460d9a9c 100644 --- a/modules/core/cs_unban.cpp +++ b/modules/core/cs_unban.cpp @@ -48,7 +48,7 @@ class CommandCSUnban : public Command return MOD_CONT; } - common_unban(ci, u2); + common_unban(ci, u2, u == u2); if (u2 == u) source.Reply(CHAN_UNBANNED, c->name.c_str()); else diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index 0dc409b29..28939c7fb 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -25,7 +25,6 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 1, /* Chan SQlines */ 1, /* Quit on Kill */ - 1, /* SVSMODE unban */ 0, /* vidents */ 1, /* svshold */ 1, /* time stamp on mode */ @@ -103,12 +102,6 @@ class BahamutIRCdProto : public IRCDProto send_cmd(Config->ServerName, "SVSHOLD %s 0", nick.c_str()); } - /* SVSMODE -b */ - void SendBanDel(const Channel *c, const Anope::string &nick) - { - SendSVSModeChan(c, "-b", nick); - } - /* SVSMODE channel modes */ void SendSVSModeChan(const Channel *c, const Anope::string &mode, const Anope::string &nick) { diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index 267ec21f4..42c016a37 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -25,7 +25,6 @@ IRCDVar myIrcd[] = { 1, /* Join 2 Message */ 0, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ 1, /* vidents */ 1, /* svshold */ 0, /* time stamp on mode */ diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 0561b5e87..3ca68f40b 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -31,7 +31,6 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 0, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ 1, /* vidents */ 1, /* svshold */ 0, /* time stamp on mode */ diff --git a/modules/protocol/inspircd20.cpp b/modules/protocol/inspircd20.cpp index ff6a0688b..4a2342672 100644 --- a/modules/protocol/inspircd20.cpp +++ b/modules/protocol/inspircd20.cpp @@ -31,7 +31,6 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 0, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ 1, /* vidents */ 1, /* svshold */ 0, /* time stamp on mode */ diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 9b12627eb..8e025f59e 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -25,7 +25,6 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 1, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ 0, /* vidents */ 1, /* svshold */ 1, /* time stamp on mode */ diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index a1172fa40..914010b98 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -25,7 +25,6 @@ IRCDVar myIrcd[] = { 1, /* Join 2 Message */ 1, /* Chan SQlines */ 0, /* Quit on Kill */ - 0, /* SVSMODE unban */ 0, /* vidents */ 0, /* svshold */ 0, /* time stamp on mode */ diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp index bf3d178ce..4c0d79ee2 100644 --- a/modules/protocol/unreal32.cpp +++ b/modules/protocol/unreal32.cpp @@ -25,7 +25,6 @@ IRCDVar myIrcd[] = { 0, /* Join 2 Message */ 0, /* Chan SQlines */ 0, /* Quit on Kill */ - 1, /* SVSMODE unban */ 1, /* vidents */ 1, /* svshold */ 1, /* time stamp on mode */ @@ -301,12 +300,6 @@ class UnrealIRCdProto : public IRCDProto send_cmd("", "BR + %s :%s", edited_reason.c_str(), x->Mask.c_str()); } - /* SVSMODE -b */ - void SendBanDel(const Channel *c, const Anope::string &nick) - { - SendSVSModeChan(c, "-b", nick); - } - /* SVSMODE channel modes */ void SendSVSModeChan(const Channel *c, const Anope::string &mode, const Anope::string &nick) -- cgit