diff options
| author | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-21 23:45:32 +0000 |
|---|---|---|
| committer | danieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7> | 2009-10-21 23:45:32 +0000 |
| commit | ff3eef491aa9e107d09d9dd9560ef7715b37b3b3 (patch) | |
| tree | 76532ed5d9dd8ec0deb86793bc72d548e7a4c76a /src/channels.cpp | |
| parent | 123eac3f25ce4dd3142b4ac66eb321f7df1e23e4 (diff) | |
Move all local-only fields to LocalUser
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11944 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/channels.cpp')
| -rw-r--r-- | src/channels.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index d7f8f372e..d0d8e52c5 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -218,24 +218,20 @@ Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char */ if (IS_LOCAL(user) && !override) { - // Checking MyClass exists because we *may* get here with NULL, not 100% sure. - if (user->MyClass && user->MyClass->maxchans) + if (user->HasPrivPermission("channels/high-join-limit")) { - if (user->HasPrivPermission("channels/high-join-limit")) + if (user->chans.size() >= ServerInstance->Config->OperMaxChans) { - if (user->chans.size() >= ServerInstance->Config->OperMaxChans) - { - user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); - return NULL; - } + user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); + return NULL; } - else + } + else + { + if (user->chans.size() >= user->GetClass()->maxchans) { - if (user->chans.size() >= user->MyClass->maxchans) - { - user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); - return NULL; - } + user->WriteNumeric(ERR_TOOMANYCHANNELS, "%s %s :You are on too many channels",user->nick.c_str(), cn); + return NULL; } } } @@ -291,7 +287,7 @@ Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char else if (MOD_RESULT == MOD_RES_PASSTHRU) { std::string ckey = Ptr->GetModeParameter('k'); - bool invited = user->IsInvited(Ptr->name.c_str()); + bool invited = IS_LOCAL(user)->IsInvited(Ptr->name.c_str()); bool can_bypass = ServerInstance->Config->InvBypassModes && invited; if (!ckey.empty()) @@ -338,7 +334,7 @@ Channel* Channel::JoinUser(User *user, const char* cn, bool override, const char */ if (invited) { - user->RemoveInvite(Ptr->name.c_str()); + IS_LOCAL(user)->RemoveInvite(Ptr->name.c_str()); } } } |