X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=d5ce160ac97202be83f1e2c72cb03ff1fd204a67;hb=4cc6e5e14fdbde499481dbab5ab2ad1257b8af9c;hp=94ed1d1f31af081b96b743e0d65cb225b3d0eb6f;hpb=fea1a27cb96a114f698eedcf90401b78406108fb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 94ed1d1f3..d5ce160ac 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,40 +2,33 @@
  *       | 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 <vector>
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "commands.h"
-#include "helperfuncs.h"
-#include "message.h"
+#include "inspircd.h"
 #include "commands/cmd_invite.h"
 
-extern ServerConfig* Config;
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
+extern "C" DllExport Command* init_command(InspIRCd* Instance)
+{
+	return new CommandInvite(Instance);
+}
 
-void cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
+/** Handle /INVITE
+ */
+CmdResult CommandInvite::Handle (const char** parameters, int pcnt, User *user)
 {
 	int MOD_RESULT = 0;
 
 	if (pcnt == 2)
 	{
-		userrec* u = Find(parameters[0]);
-		chanrec* c = FindChan(parameters[1]);
+		User* u = ServerInstance->FindNick(parameters[0]);
+		Channel* c = ServerInstance->FindChan(parameters[1]);
 
 		if ((!c) || (!u))
 		{
@@ -48,41 +41,58 @@ 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)))
+		if ((c->IsModeSet('i')) && (IS_LOCAL(user)))
 		{
-			if (cstatus(user,c) < STATUS_HOP)
+			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;
+				user->WriteServ("482 %s %s :You must be a channel %soperator", user->nick, c->name, c->GetStatus(u) == STATUS_HOP ? "" : "half-");
+				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);
+		switch (ServerInstance->Config->AnnounceInvites)
+		{
+			case ServerConfig::INVITE_ANNOUNCE_ALL:
+				c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+			break;
+			case ServerConfig::INVITE_ANNOUNCE_OPS:
+				c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+			break;
+			case ServerConfig::INVITE_ANNOUNCE_DYNAMIC:
+				if (c->IsModeSet('i'))
+					c->WriteAllExceptSender(user, true, '@', "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+				else
+					c->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :*** %s invited %s into the channel", c->name, user->nick, u->nick);
+			break;
+			default:
+				/* Nobody */
+			break;
+		}
 		FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
 	}
 	else
@@ -92,8 +102,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;
 }
+