X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcmd_invite.cpp;h=6f6cbaa7d70271efb02b6af133a773414e8e4031;hb=59b1a8955142935b02af6446005ab47fc7c3fc8c;hp=931c684ce7fc985eb30e05390d6cb03e0319816f;hpb=0940f6801c25defb7bf9e82b88bb913cf1110505;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/cmd_invite.cpp b/src/cmd_invite.cpp
index 931c684ce..6f6cbaa7d 100644
--- a/src/cmd_invite.cpp
+++ b/src/cmd_invite.cpp
@@ -2,10 +2,10 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2005 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
- *                <brain.net>
- *                <Craig.net>
+ *                <brain@chatspike.net>
+ *                <Craig@chatspike.net>
  *
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -36,6 +36,7 @@ using namespace std;
 #include "command_parse.h"
 #include "cmd_invite.h"
 
+extern ServerConfig* Config;
 extern int MODCOUNT;
 extern std::vector<Module*> modules;
 extern std::vector<ircd_module*> factory;
@@ -55,16 +56,13 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 			}
 			else
 			{
-				if (c->binarymodes & CM_INVITEONLY)
-				{
-					WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-				}
+				WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
 			}
 
 			return;
 		}
 
-		if (c->binarymodes & CM_INVITEONLY)
+		if ((c->binarymodes & CM_INVITEONLY) && (IS_LOCAL(user)))
 		{
 			if (cstatus(user,c) < STATUS_HOP)
 			{
@@ -77,14 +75,14 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 	 		WriteServ(user->fd,"443 %s %s %s :Is already on channel %s",user->nick,u->nick,c->name,c->name);
 	 		return;
 		}
-		if (!has_channel(user,c))
+		if ((IS_LOCAL(user)) && (!has_channel(user,c)))
 	 	{
 			WriteServ(user->fd,"442 %s %s :You're not on that channel!",user->nick, c->name);
 	  		return;
 		}
 
 		int MOD_RESULT = 0;
-		FOREACH_RESULT(OnUserPreInvite(user,u,c));
+		FOREACH_RESULT(I_OnUserPreInvite,OnUserPreInvite(user,u,c));
 		if (MOD_RESULT == 1) {
 			return;
 		}
@@ -93,7 +91,7 @@ void cmd_invite::Handle (char **parameters, int pcnt, userrec *user)
 		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);
-		FOREACH_MOD OnUserInvite(user,u,c);
+		FOREACH_MOD(I_OnUserInvite,OnUserInvite(user,u,c));
 	}
 	else
 	{