X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..29c8637abbfafd8a85a20fe1c3b37a0ffaae9d84:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 8230a30..eb6c041 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -21,11 +21,10 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_invite.c 718 2006-02-08 20:26:58Z jilles $
+ *  $Id: m_invite.c 3438 2007-05-06 14:46:45Z jilles $
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "channel.h"
 #include "client.h"
@@ -48,7 +47,7 @@ struct Message invite_msgtab = {
 	{mg_unreg, {m_invite, 3}, {m_invite, 3}, mg_ignore, mg_ignore, {m_invite, 3}}
 };
 mapi_clist_av1 invite_clist[] = { &invite_msgtab, NULL };
-DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 718 $");
+DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 3438 $");
 
 static void add_invite(struct Channel *, struct Client *);
 
@@ -68,11 +67,20 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	if((target_p = find_person(parv[1])) == NULL)
+	if(MyClient(source_p))
+		target_p = find_named_person(parv[1]);
+	else
+		target_p = find_person(parv[1]);
+	if(target_p == NULL)
 	{
-		sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
-				   form_str(ERR_NOSUCHNICK), 
-				   IsDigit(parv[1][0]) ? "*" : parv[1]);
+		if(!MyClient(source_p) && IsDigit(parv[1][0]))
+			sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
+					   "* :Target left IRC. Failed to invite to %s", 
+					   parv[2]);
+		else
+			sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
+					   form_str(ERR_NOSUCHNICK), 
+					   parv[1]);
 		return 0;
 	}
 
@@ -125,24 +133,24 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 		return 0;
 	}
 
-	/* only store invites for +i channels */
-	/* if the invite could allow someone to join who otherwise could not,
-	 * unconditionally require ops, unless the channel is +g */
-	if(ConfigChannel.invite_ops_only || (chptr->mode.mode & MODE_INVITEONLY))
+	/* unconditionally require ops, unless the channel is +g */
+	/* treat remote clients as chanops */
+	if(MyClient(source_p) && !is_chanop(msptr) &&
+			!(chptr->mode.mode & MODE_FREEINVITE))
 	{
-		/* treat remote clients as chanops */
-		if(MyClient(source_p) && !is_chanop(msptr) &&
-				!(chptr->mode.mode & MODE_FREEINVITE))
-		{
-			sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-				   me.name, source_p->name, parv[2]);
-			return 0;
-		}
-
-		if(chptr->mode.mode & MODE_INVITEONLY)
-			store_invite = 1;
+		sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+			   me.name, source_p->name, parv[2]);
+		return 0;
 	}
 
+	/* store invites when they could affect the ability to join
+	 * for +l/+j just check if the mode is set, this varies over time
+	 */
+	if(chptr->mode.mode & MODE_INVITEONLY ||
+			(chptr->mode.mode & MODE_REGONLY && EmptyString(target_p->user->suser)) ||
+			chptr->mode.limit || chptr->mode.join_num)
+		store_invite = 1;
+
 	if(MyConnect(source_p))
 	{
 		sendto_one(source_p, form_str(RPL_INVITING), 
@@ -187,17 +195,17 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 static void
 add_invite(struct Channel *chptr, struct Client *who)
 {
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	/* already invited? */
-	DLINK_FOREACH(ptr, who->user->invited.head)
+	RB_DLINK_FOREACH(ptr, who->user->invited.head)
 	{
 		if(ptr->data == chptr)
 			return;
 	}
 
 	/* ok, if their invite list is too long, remove the tail */
-	if((int)dlink_list_length(&who->user->invited) >= 
+	if((int)rb_dlink_list_length(&who->user->invited) >= 
 	   ConfigChannel.max_chans_per_user)
 	{
 		ptr = who->user->invited.tail;
@@ -205,10 +213,10 @@ add_invite(struct Channel *chptr, struct Client *who)
 	}
 
 	/* add user to channel invite list */
-	dlinkAddAlloc(who, &chptr->invites);
+	rb_dlinkAddAlloc(who, &chptr->invites);
 
 	/* add channel to user invite list */
-	dlinkAddAlloc(chptr, &who->user->invited);
+	rb_dlinkAddAlloc(chptr, &who->user->invited);
 }