Allow /ojoin !#channel/%#channel, if admin/halfop are enabled.

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

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 799515e201281a1bd983c2dbc08f941e91f27630..8dd0a73596b763e757dba17d69fc296f8d87c8d4 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
  */
@@ -111,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,
@@ -136,11 +145,31 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
        /* unconditionally require ops, unless the channel is +g */
        /* treat remote clients as chanops */
-       if(MyClient(source_p) && !is_chanop(msptr) &&
+       if(MyClient(source_p) && !is_any_op(msptr) &&
                        !(chptr->mode.mode & MODE_FREEINVITE))
        {
-               sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
-                          me.name, source_p->name, parv[2]);
+               if(IsOverride(source_p))
+               {
+                       sendto_wallops_flags(UMODE_WALLOP, &me,
+                                       "%s is overriding INVITE [%s] on [%s]",
+                                       get_oper_name(source_p), target_p->name, chptr->chname);
+                       sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+                                       ":%s WALLOPS :%s is overriding INVITE [%s] on [%s]",
+                                       me.name, get_oper_name(source_p), target_p->name, chptr->chname);
+               }
+               else
+               {
+                       sendto_one(source_p, form_str(ERR_CHANOPRIVSNEEDED),
+                                       me.name, source_p->name, parv[2]);
+                       return 0;
+               }
+       }
+
+       if (IsSetNoInvite(target_p))
+       {
+               sendto_one_numeric(source_p, ERR_NOINVITE,
+                               form_str(ERR_NOINVITE),
+                               target_p->name);
                return 0;
        }
 
@@ -154,6 +183,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]);
@@ -171,6 +208,34 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 
        if(MyConnect(target_p))
        {
+               if(!IsOper(source_p) && (IsSetCallerId(target_p) ||
+                                       (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])) &&
+                               !accept_message(source_p, target_p))
+               {
+                       if (IsSetRegOnlyMsg(target_p) && !source_p->user->suser[0])
+                       {
+                               sendto_one_numeric(source_p, ERR_NONONREG,
+                                               form_str(ERR_NONONREG),
+                                               target_p->name);
+                               return 0;
+                       }
+                       else
+                       {
+                               /* instead of sending RPL_UMODEGMSG,
+                                * just let the invite through
+                                */
+                               if((target_p->localClient->last_caller_id_time +
+                                   ConfigFileEntry.caller_id_wait) >= rb_current_time())
+                               {
+                                       sendto_one_numeric(source_p, ERR_TARGUMODEG,
+                                                          form_str(ERR_TARGUMODEG),
+                                                          target_p->name);
+                                       return 0;
+                               }
+                               target_p->localClient->last_caller_id_time = rb_current_time();
+                       }
+               }
+               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);
@@ -214,10 +279,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);
 }