diff options
| author | n0kS Phr33d0m <god@politeia.in> | 2013-08-23 06:43:57 +0200 |
|---|---|---|
| committer | n0kS Phr33d0m <god@politeia.in> | 2013-08-23 06:43:57 +0200 |
| commit | 97930620079db049ee9ae5a53f0c6d4491ac0fb5 (patch) | |
| tree | 5ed193e7fcf9940e815e9a518ddb7d7d2f803720 /src | |
| parent | f86dc247e521b893d134b08329e69e17ccf34e1f (diff) | |
| parent | 5ac0c9a32732fde91844a9b8c64e676893ea7331 (diff) | |
Merge branch '1.9' of github.com:anope/anope into 1.9
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.cpp | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 84e90792d..22f90e28f 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -795,21 +795,28 @@ void Channel::SetCorrectModes(User *user, bool give_modes) FOREACH_MOD(OnSetCorrectModes, (user, this, u_access, give_modes, take_modes)); /* Never take modes from ulines */ - take_modes &= !user->server->IsULined(); + if (user->server->IsULined()) + take_modes = false; + /* whether or not we are giving modes */ + bool giving = give_modes; + /* whether or not we have given a mode */ bool given = false; for (unsigned i = 0; i < ModeManager::GetStatusChannelModesByRank().size(); ++i) { ChannelModeStatus *cm = ModeManager::GetStatusChannelModesByRank()[i]; bool has_priv = u_access.HasPriv("AUTO" + cm->name); - /* If we have already given one mode, don't give more until it has a symbol */ - if (give_modes && has_priv && (!given || cm->symbol)) + if (give_modes && has_priv) { - this->SetMode(NULL, cm, user->GetUID()); - /* Now if this contains a symbol don't give any more modes, to prevent setting +qaohv etc on users */ - give_modes = !cm->symbol; - given = true; + /* Always give op. If we have already given one mode, don't give more until it has a symbol */ + if (cm->name == "OP" || !given || (giving && cm->symbol)) + { + this->SetMode(NULL, cm, user->GetUID()); + /* Now if this contains a symbol don't give any more modes, to prevent setting +qaohv etc on users */ + giving = !cm->symbol; + given = true; + } } else if (take_modes && !has_priv) { |