X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=0eb3a2354ccff70b1ad105fc96e71f36c9d806ce;hb=eb334f8c69872cc0de28ffd85b41555f196a23dd;hp=587dbc5f398ba7ef98d4e4b0915a5bd787becca8;hpb=4cf0ae1308fe98757de42ffbe391e61844ac9e0a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 587dbc5f3..0eb3a2354 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,30 +2,28 @@
  *       | 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"
 
-
-
-extern "C" command_t* init_command(InspIRCd* Instance)
+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;
@@ -60,7 +58,7 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 
 		if (c->HasUser(u))
 	 	{
-	 		user->WriteServ("443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
+	 		user->WriteServ("443 %s %s %s :is already on channel",user->nick,u->nick,c->name);
 	 		return CMD_FAILURE;
 		}
 
@@ -77,10 +75,11 @@ CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 			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
@@ -90,7 +89,7 @@ CmdResult 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);
 	}