* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
time_t timeout = 0;
if (parameters.size() == 3)
{
- timeout = time(NULL) + ServerInstance->Duration(parameters[2]);
+ if (IS_LOCAL(user))
+ timeout = ServerInstance->Time() + ServerInstance->Duration(parameters[2]);
+ else
+ timeout = ConvToInt(parameters[2]);
}
if ((!c) || (!u))
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());
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());