From 48f5beea5b9076c969c2b58c11f068697ed2b811 Mon Sep 17 00:00:00 2001 From: w00t Date: Thu, 7 Aug 2008 15:59:01 +0000 Subject: [PATCH] Always deny invite to users below halfop status, move OnUserPreInvite up to above that access check, and allow a return of -1 to bypass the check. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10115 e03df62e-2008-0410-955e-edbf42e46eb7 --- include/modules.h | 2 +- src/commands/cmd_invite.cpp | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/modules.h b/include/modules.h index 3f4be033a..f527cb065 100644 --- a/include/modules.h +++ b/include/modules.h @@ -619,7 +619,7 @@ class CoreExport Module : public Extensible * @param dest The user being invited * @param channel The channel the user is being invited to * @param timeout The time the invite will expire (0 == never) - * @return 1 to deny the invite, 0 to allow + * @return 1 to deny the invite, 0 to check whether or not the user has permission to invite, -1 to explicitly allow the invite */ virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout); diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp index c0da70b6e..9e74b541b 100644 --- a/src/commands/cmd_invite.cpp +++ b/src/commands/cmd_invite.cpp @@ -41,15 +41,6 @@ CmdResult CommandInvite::Handle (const std::vector& parameters, Use return CMD_FAILURE; } - if ((c->IsModeSet('i')) && (IS_LOCAL(user))) - { - if (c->GetStatus(user) < STATUS_HOP) - { - user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-"); - return CMD_FAILURE; - } - } - if (c->HasUser(u)) { user->WriteNumeric(ERR_USERONCHANNEL, "%s %s %s :is already on channel",user->nick.c_str(),u->nick.c_str(),c->name.c_str()); @@ -61,13 +52,24 @@ CmdResult CommandInvite::Handle (const std::vector& parameters, Use user->WriteNumeric(ERR_NOTONCHANNEL, "%s %s :You're not on that channel!",user->nick.c_str(), c->name.c_str()); return CMD_FAILURE; } - { FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c,timeout)); if (MOD_RESULT == 1) + { return CMD_FAILURE; } + else if (MOD_RESULT == 0) + { + if (IS_LOCAL(user)) + { + if (c->GetStatus(user) < STATUS_HOP) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator", user->nick.c_str(), c->name.c_str(), c->GetStatus(u) == STATUS_HOP ? "" : "half-"); + return CMD_FAILURE; + } + } + } u->InviteTo(c->name.c_str(), timeout); u->WriteFrom(user,"INVITE %s :%s",u->nick.c_str(),c->name.c_str()); -- 2.39.5