Guess what i added here?

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

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 9c5abacdec83331491de0acc423430b35c17df79..0eb3a2354ccff70b1ad105fc96e71f36c9d806ce 100644 (file)
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,24 +2,29 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
+#include "inspircd.h"
 #include "configreader.h"
 #include "users.h"
 #include "modules.h"
 #include "commands/cmd_invite.h"
 
-void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
+{
+       return new cmd_invite(Instance);
+}
+
+/** Handle /INVITE
+ */
+CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 {
        int MOD_RESULT = 0;
 
@@ -39,7 +44,7 @@ void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                                user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                        }
 
-                       return;
+                       return CMD_FAILURE;
                }
 
                if ((c->modes[CM_INVITEONLY]) && (IS_LOCAL(user)))
@@ -47,33 +52,34 @@ void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                        if (c->GetStatus(user) < STATUS_HOP)
                        {
                                user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, c->name);
-                               return;
+                               return CMD_FAILURE;
                        }
                }
 
                if (c->HasUser(u))
                {
-                       user->WriteServ("443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
-                       return;
+                       user->WriteServ("443 %s %s %s :is already on channel",user->nick,u->nick,c->name);
+                       return CMD_FAILURE;
                }
 
                if ((IS_LOCAL(user)) && (!c->HasUser(user)))
                {
                        user->WriteServ("442 %s %s :You're not on that channel!",user->nick, c->name);
-                       return;
+                       return CMD_FAILURE;
                }
 
                FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
 
                if (MOD_RESULT == 1)
                {
-                       return;
+                       return CMD_FAILURE;
                }
 
-               irc::string xname(c->name);
-               u->InviteTo(xname);
+               u->InviteTo(c->name);
                u->WriteFrom(user,"INVITE %s :%s",u->nick,c->name);
                user->WriteServ("341 %s %s %s",user->nick,u->nick,c->name);
+               if (ServerInstance->Config->AnnounceInvites)
+                       c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
                FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
        }
        else
@@ -83,8 +89,10 @@ void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
                InvitedList* il = user->GetInviteList();
                for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
                {
-                       user->WriteServ("346 %s :%s",user->nick,i->channel.c_str());
+                       user->WriteServ("346 %s :%s",user->nick,i->c_str());
                }
                user->WriteServ("347 %s :End of INVITE list",user->nick);
        }
+       return CMD_SUCCESS;
 }
+