Fix trampling on memory in Z/G/K/ELine.

[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 d5ce160ac97202be83f1e2c72cb03ff1fd204a67..42905d9bf3f77e9c8e2ea296bc704ac4294fb9fb 100644 (file)
--- a/src/commands/cmd_invite.cpp
+++ b/src/commands/cmd_invite.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -25,10 +25,15 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
 {
        int MOD_RESULT = 0;
 
-       if (pcnt == 2)
+       if (pcnt == 2 || pcnt == 3)
        {
                User* u = ServerInstance->FindNick(parameters[0]);
                Channel* c = ServerInstance->FindChan(parameters[1]);
+               time_t timeout = 0;
+               if (pcnt == 3)
+               {
+                       timeout = time(NULL) + ServerInstance->Duration(parameters[2]);
+               }
 
                if ((!c) || (!u))
                {
@@ -65,14 +70,14 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
                        return CMD_FAILURE;
                }
 
-               FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
+               FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c,timeout));
 
                if (MOD_RESULT == 1)
                {
                        return CMD_FAILURE;
                }
 
-               u->InviteTo(c->name);
+               u->InviteTo(c->name, timeout);
                u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name);
                user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name);
                switch (ServerInstance->Config->AnnounceInvites)
@@ -93,7 +98,7 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
                                /* Nobody */
                        break;
                }
-               FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
+               FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c,timeout));
        }
        else
        {
@@ -102,7 +107,7 @@ CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
                InvitedList* il = user->GetInviteList();
                for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
                {
-                       user->WriteServ("346 %s :%s",user->nick,i->c_str());
+                       user->WriteServ("346 %s :%s",user->nick,i->first.c_str());
                }
                user->WriteServ("347 %s :End of INVITE list",user->nick);
        }