X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fchannels.cpp;h=7374f091e80997f1abbe9d6939b5abfd90a7a3ab;hb=93b0661ddaebc82df76e0268ebe0ab0c17f7cbc7;hp=2884b2d3b659afdc052e6d7e421bf396655427b6;hpb=8d7e3fab28008e6353c7520c711aefc4a10e282d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/channels.cpp b/src/channels.cpp index 2884b2d3b..7374f091e 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -276,7 +276,7 @@ Channel* Channel::JoinUser(InspIRCd* Instance, User *user, const char* cn, bool } else { - if (IS_OPER(user)) + if (user->HasPrivPermission("channels/high-join-limit")) { if (user->chans.size() >= Instance->Config->OperMaxChans) { @@ -563,8 +563,6 @@ bool Channel::IsExtBanned(User *user, char type) /* Channel::PartUser * remove a channel from a users record, and return the number of users left. * Therefore, if this function returns 0 the caller should delete the Channel. - * - * XXX: bleh, string copy of reason, fixme! -- w00t */ long Channel::PartUser(User *user, std::string &reason) {