diff options
| author | lethality <lethality@anope.org> | 2012-02-23 00:04:36 +0000 |
|---|---|---|
| committer | lethality <lethality@anope.org> | 2012-02-23 00:04:36 +0000 |
| commit | f01aab5f9bf5c14162438d1707e6e6cd9730c703 (patch) | |
| tree | 4df360cd61e7dd1fd749d90e9dbe9e3cf1d739af /modules/commands/os_forbid.cpp | |
| parent | 826de43724d4584f9150a1fb8cebe8f49d9431a7 (diff) | |
| parent | 3850b073ddf610415de54dced9ff134397779676 (diff) | |
Merge branch '1.9' of ssh://anope.git.sf.net/gitroot/anope/anope into 1.9
Diffstat (limited to 'modules/commands/os_forbid.cpp')
| -rw-r--r-- | modules/commands/os_forbid.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/modules/commands/os_forbid.cpp b/modules/commands/os_forbid.cpp index 908e2f2ca..d305de3c6 100644 --- a/modules/commands/os_forbid.cpp +++ b/modules/commands/os_forbid.cpp @@ -41,7 +41,7 @@ class MyForbidService : public ForbidService { ForbidData *d = this->forbidData[i - 1]; - if ((ftype == FT_NONE || ftype == d->type) && Anope::Match(mask, d->mask)) + if ((ftype == FT_NONE || ftype == d->type) && Anope::Match(mask, d->mask, false, true)) return d; } return NULL; @@ -217,6 +217,10 @@ class CommandOSForbid : public Command source.Reply(" "); source.Reply(_("Forbid allows you to forbid usage of certain nicknames, channels,\n" "and email addresses. Wildcards are accepted for all entries.")); + if (!Config->RegexEngine.empty()) + source.Reply(" \n" + "Regex matches are also supported using the %s engine.\n" + "Enclose your pattern in // if this desired.", Config->RegexEngine.c_str()); return true; } }; @@ -273,8 +277,13 @@ class OSForbid : public Module BotInfo *bi = findbot(Config->OperServ); ForbidData *d = this->forbidService.FindForbid(c->name, FT_CHAN); if (bi != NULL && d != NULL) - { - if (!c->HasFlag(CH_INHABIT)) + { + if (ircd->chansqline) + { + XLine x(c->name, bi->nick, Anope::CurTime + Config->CSInhabit, d->reason); + ircdproto->SendSQLine(NULL, &x); + } + else if (!c->HasFlag(CH_INHABIT)) { /* Join ChanServ and set a timer for this channel to part ChanServ later */ c->Hold(); |