Second attempt at time() -> SI->Time(), now problems with the original were fixed...

[user/henk/code/inspircd.git] / src / commands / cmd_invite.cpp

diff --git a/src/commands/cmd_invite.cpp b/src/commands/cmd_invite.cpp
index c0da70b6e157f60baa88256b1876c837cd74954b..1a70fbe0e0b9a6e108235034dfffc18a8dea3f9a 100644 (file)
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -32,7 +32,10 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& parameters, Use
                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))
@@ -41,15 +44,6 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& 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 +55,24 @@ CmdResult CommandInvite::Handle (const std::vector<std::string>& 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());