diff options
| author | Adam <Adam@anope.org> | 2011-05-06 18:02:53 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2011-05-16 04:10:18 -0400 |
| commit | fd4b52ec385167794eaadb18ee635bef757728ee (patch) | |
| tree | 49d3e835b072a10887309d8d9155982a5aa61ed0 /src/regchannel.cpp | |
| parent | b59602abf85d522bb2f188be70b6cb7c9556a856 (diff) | |
Added os_forbid
Diffstat (limited to 'src/regchannel.cpp')
| -rw-r--r-- | src/regchannel.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 4d8dc8198..5a94027ae 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -789,10 +789,10 @@ bool ChannelInfo::CheckKick(User *user) do_kick = true; Anope::string mask, reason; - if (!user->HasMode(UMODE_OPER) && (this->HasFlag(CI_SUSPENDED) || this->HasFlag(CI_FORBIDDEN))) + if (!user->HasMode(UMODE_OPER) && this->HasFlag(CI_SUSPENDED)) { get_idealban(this, user, mask); - reason = this->forbidreason.empty() ? GetString(user->Account(), _("This channel may not be used.")) : this->forbidreason; + reason = GetString(user->Account(), _("This channel may not be used.")); set_modes = true; do_kick = true; } @@ -850,9 +850,9 @@ bool ChannelInfo::CheckKick(User *user) * ChanServ always enforces channels like this to keep people from deleting bots etc * that are holding channels. */ - if (this->c->users.size() == (this->bi && this->c->FindUser(this->bi) ? 2 : 1) && !this->HasFlag(CI_INHABIT) && !this->c->HasFlag(CH_SYNCING)) + if (this->c->users.size() == (this->bi && this->c->FindUser(this->bi) ? 2 : 1) && !this->c->HasFlag(CH_INHABIT) && !this->c->HasFlag(CH_SYNCING)) { - /* If channel was forbidden, etc, set it +si to prevent rejoin */ + /* Set +si to prevent rejoin */ if (set_modes) { c->SetMode(NULL, CMODE_NOEXTERNAL); |