X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/860d2381cf16667b639bfdef25a2a13e010a2485..ea41b24fd4807e3565bf5f8f293e2efc4c20b62d:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index bbdee565..e20ea7a7 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -37,6 +37,7 @@
 #include "modules.h"
 #include "packet.h"
 #include "tgchange.h"
+#include "s_newconf.h"
 
 static const char invite_desc[] = "Provides /invite";
 
@@ -176,7 +177,7 @@ m_invite(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
 	if(MyConnect(source_p))
 	{
-		if (ConfigFileEntry.target_change && !IsOper(source_p) &&
+		if (ConfigFileEntry.target_change && !IsOperGeneral(source_p) &&
 				!find_allowing_channel(source_p, target_p) &&
 				!add_target(source_p, target_p))
 		{
@@ -201,30 +202,6 @@ m_invite(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source
 
 	if(MyConnect(target_p))
 	{
-		if(!IsOper(source_p) && IsSetCallerId(target_p) && !accept_message(source_p, target_p))
-		{
-			sendto_one_numeric(source_p, ERR_TARGUMODEG,
-					   form_str(ERR_TARGUMODEG),
-					   target_p->name);
-
-			if((target_p->localClient->last_caller_id_time +
-			    ConfigFileEntry.caller_id_wait) < rb_current_time())
-			{
-				sendto_one_numeric(source_p, RPL_TARGNOTIFY,
-							form_str(RPL_TARGNOTIFY),
-							target_p->name);
-
-				add_reply_target(target_p, source_p);
-				sendto_one(target_p, form_str(RPL_UMODEGMSG),
-					   me.name, target_p->name, source_p->name,
-					   source_p->username, source_p->host);
-
-				target_p->localClient->last_caller_id_time = rb_current_time();
-			}
-
-			return;
-		}
-
 		hdata.chptr = chptr;
 		hdata.msptr = msptr;
 		hdata.client = source_p;