target change: Allow free replies.

[irc/rqf/shadowircd.git] / modules / m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 5e9edc00934db10dd6b64f372a3378e41472c182..cff1f83b8a5fc476550cb138e7f3999494bafabc 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -21,16 +21,15 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_invite.c 3257 2007-03-13 16:09:28Z 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"
 #include "hash.h"
-#include "irc_string.h"
+#include "match.h"
 #include "ircd.h"
 #include "numeric.h"
 #include "send.h"
@@ -48,12 +47,11 @@ 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: 3257 $");
+DECLARE_MODULE_AV1(invite, NULL, NULL, invite_clist, NULL, NULL, "$Revision: 3438 $");
 
 static void add_invite(struct Channel *, struct Client *);
 
 /* m_invite()
- *      parv[0] - sender prefix
  *      parv[1] - user to invite
  *      parv[2] - channel name
  */
@@ -68,11 +66,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;
        }
 
@@ -102,6 +109,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,
@@ -125,7 +142,6 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
-       /* only store invites for +i channels */
        /* unconditionally require ops, unless the channel is +g */
        /* treat remote clients as chanops */
        if(MyClient(source_p) && !is_chanop(msptr) &&
@@ -136,7 +152,12 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
                return 0;
        }
 
-       if(chptr->mode.mode & MODE_INVITEONLY)
+       /* 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))
@@ -183,17 +204,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;
@@ -201,10 +222,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);
 }