X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=0eb3a2354ccff70b1ad105fc96e71f36c9d806ce;hb=16add8425c1cdc77aa72c13cbd3070b31acd6f22;hp=a05b31f397851e328b48b090d432ac7461fa087a;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index a05b31f39..0eb3a2354 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,98 +2,84 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include <string>
-#include <vector>
-#include <deque>
+#include "configreader.h"
 #include "users.h"
-#include "ctables.h"
-#include "globals.h"
 #include "modules.h"
-#include "dynamic.h"
-#include "message.h"
-#include "commands.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "hashcomp.h"
-#include "typedefs.h"
-#include "command_parse.h"
-#include "cmd_invite.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_t* init_command(InspIRCd* Instance)
+{
+	return new cmd_invite(Instance);
+}
 
-void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
+/** Handle /INVITE
+ */
+CmdResult cmd_invite::Handle (const char** parameters, int pcnt, userrec *user)
 {
+	int MOD_RESULT = 0;
+
 	if (pcnt == 2)
 	{
-		userrec* u = Find(parameters[0]);
-		chanrec* c = FindChan(parameters[1]);
+		userrec* u = ServerInstance->FindNick(parameters[0]);
+		chanrec* c = ServerInstance->FindChan(parameters[1]);
 
 		if ((!c) || (!u))
 		{
 			if (!c)
 			{
-				WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[1]);
+				user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[1]);
 			}
 			else
 			{
-				if (c->binarymodes & CM_INVITEONLY)
-				{
-					WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-				}
+				user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
 			}
 
-			return;
+			return CMD_FAILURE;
 		}
 
-		if (c->binarymodes & CM_INVITEONLY)
+		if ((c->modes[CM_INVITEONLY]) && (IS_LOCAL(user)))
 		{
-			if (cstatus(user,c) < STATUS_HOP)
+			if (c->GetStatus(user) < STATUS_HOP)
 			{
-				WriteServ(user->fd,"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 at least a half-operator to change modes on this channel",user->nick, c->name);
+				return CMD_FAILURE;
 			}
 		}
-		if (has_channel(u,c))
+
+		if (c->HasUser(u))
 	 	{
-	 		WriteServ(user->fd,"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 (!has_channel(user,c))
+
+		if ((IS_LOCAL(user)) && (!c->HasUser(user)))
 	 	{
-			WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
-	  		return;
+			user->WriteServ("442 %s %s :You're not on that channel!",user->nick, c->name);
+	  		return CMD_FAILURE;
 		}
 
-		int MOD_RESULT = 0;
 		FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
-		if (MOD_RESULT == 1) {
-			return;
+
+		if (MOD_RESULT == 1)
+		{
+			return CMD_FAILURE;
 		}
 
-		irc::string xname(c->name);
-		u->InviteTo(xname);
-		WriteFrom(u->fd,user,"INVITE %s :%s",u->nick,c->name);
-		WriteServ(user->fd,"341 %s %s %s",user->nick,u->nick,c->name);
+		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
@@ -103,10 +89,10 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 		InvitedList* il = user->GetInviteList();
 		for (InvitedList::iterator i = il->begin(); i != il->end(); i++)
 		{
-			WriteServ(user->fd,"346 %s :%s",user->nick,i->channel.c_str());
+			user->WriteServ("346 %s :%s",user->nick,i->c_str());
 		}
-		WriteServ(user->fd,"347 %s :End of INVITE list",user->nick);
+		user->WriteServ("347 %s :End of INVITE list",user->nick);
 	}
+	return CMD_SUCCESS;
 }
 
-