Add missing return value.

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

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 6464ce38b1a2e9e6366a6acbdaaadde9bc79801a..e7fe2188b42bb0fd62040e0ce6e594e20ddbbda6 100644 (file)
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -25,12 +25,11 @@
  */
 
 #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"
@@ -40,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 **);
 
@@ -53,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
  */
@@ -68,7 +67,11 @@ 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)
        {
                if(!MyClient(source_p) && IsDigit(parv[1][0]))
                        sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
@@ -107,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,
@@ -150,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]);
@@ -167,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);
@@ -192,17 +214,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;
@@ -210,10 +232,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);
 }