X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/13ae2f4b6904ebf7b8160902f9ffeb80f7585ed2..0f18c084bb0d06c2dd1c26698b49a53fb528d933:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 04e04f0..e7fe218 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -39,6 +39,7 @@
 #include "parse.h"
 #include "modules.h"
 #include "packet.h"
+#include "tgchange.h"
 
 static int m_invite(struct Client *, struct Client *, int, const char **);
 
@@ -52,7 +53,6 @@ DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 343
 static void add_invite(struct Channel *, struct Client *);
 
 /* m_invite()
- *      parv[0] - sender prefix
  *      parv[1] - user to invite
  *      parv[2] - channel name
  */
@@ -110,6 +110,16 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
+	if(((MyConnect(source_p) && !IsExemptResv(source_p)) ||
+			(MyConnect(target_p) && !IsExemptResv(target_p))) &&
+		hash_find_resv(parv[2]))
+	{
+		sendto_one_numeric(source_p, ERR_BADCHANNAME,
+				   form_str(ERR_BADCHANNAME),
+				   parv[2]);
+		return 0;
+	}
+
 	if((chptr = find_channel(parv[2])) == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
@@ -153,6 +163,14 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(MyConnect(source_p))
 	{
+		if (ConfigFileEntry.target_change && !IsOper(source_p) &&
+				!find_allowing_channel(source_p, target_p) &&
+				!add_target(source_p, target_p))
+		{
+			sendto_one(source_p, form_str(ERR_TARGCHANGE),
+				   me.name, source_p->name, target_p->name);
+			return 0;
+		}
 		sendto_one(source_p, form_str(RPL_INVITING), 
 			   me.name, source_p->name,
 			   target_p->name, parv[2]);
@@ -170,6 +188,7 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
 	if(MyConnect(target_p))
 	{
+		add_reply_target(target_p, source_p);
 		sendto_one(target_p, ":%s!%s@%s INVITE %s :%s", 
 			   source_p->name, source_p->username, source_p->host, 
 			   target_p->name, chptr->chname);