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

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

diff --git a/modules/m_knock.c b/modules/m_knock.c
index ed7c3590580a8c2a08389eb050a5c22afaf0cddd..9c39e35b91c16c84d556a479fb64bc5b0d1d1609 100644 (file)
--- a/modules/m_knock.c
+++ b/modules/m_knock.c
@@ -20,16 +20,14 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_knock.c 752 2006-02-11 20:55:03Z jilles $
+ *  $Id: m_knock.c 3570 2007-09-09 19:19:23Z jilles $
  */
 
 #include "stdinc.h"
-#include "sprintf_irc.h"
-#include "tools.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"
@@ -47,10 +45,9 @@ struct Message knock_msgtab = {
 };
 
 mapi_clist_av1 knock_clist[] = { &knock_msgtab, NULL };
-DECLARE_MODULE_AV1(knock, NULL, NULL, knock_clist, NULL, NULL, "$Revision: 752 $");
+DECLARE_MODULE_AV1(knock, NULL, NULL, knock_clist, NULL, NULL, "$Revision: 3570 $");
 
 /* m_knock
- *    parv[0] = sender prefix
  *    parv[1] = channel
  *
  *  The KNOCK command has the following syntax:
@@ -106,7 +103,7 @@ m_knock(struct Client *client_p, struct Client *source_p, int parc, const char *
 
        if(!((chptr->mode.mode & MODE_INVITEONLY) || (*chptr->mode.key) || 
             (chptr->mode.limit && 
-             dlink_list_length(&chptr->members) >= (unsigned long)chptr->mode.limit)))
+             rb_dlink_list_length(&chptr->members) >= (unsigned long)chptr->mode.limit)))
        {
                sendto_one_numeric(source_p, ERR_CHANOPEN,
                                   form_str(ERR_CHANOPEN), name);
@@ -138,13 +135,13 @@ m_knock(struct Client *client_p, struct Client *source_p, int parc, const char *
                 * allow one knock per channel per knock_delay_channel
                 */
                if(!IsOper(source_p) && 
-                  (source_p->localClient->last_knock + ConfigChannel.knock_delay) > CurrentTime)
+                  (source_p->localClient->last_knock + ConfigChannel.knock_delay) > rb_current_time())
                {
                        sendto_one(source_p, form_str(ERR_TOOMANYKNOCK),
                                        me.name, source_p->name, name, "user");
                        return 0;
                }
-               else if((chptr->last_knock + ConfigChannel.knock_delay_channel) > CurrentTime)
+               else if((chptr->last_knock + ConfigChannel.knock_delay_channel) > rb_current_time())
                {
                        sendto_one(source_p, form_str(ERR_TOOMANYKNOCK),
                                        me.name, source_p->name, name, "channel");
@@ -152,16 +149,17 @@ m_knock(struct Client *client_p, struct Client *source_p, int parc, const char *
                }
 
                /* ok, we actually can send the knock, tell client */
-               source_p->localClient->last_knock = CurrentTime;
+               source_p->localClient->last_knock = rb_current_time();
 
                sendto_one(source_p, form_str(RPL_KNOCKDLVR),
                           me.name, source_p->name, name);
        }
 
-       chptr->last_knock = CurrentTime;
+       chptr->last_knock = rb_current_time();
 
        if(ConfigChannel.use_knock)
-               sendto_channel_local(ONLY_CHANOPS, chptr, form_str(RPL_KNOCK),
+               sendto_channel_local(chptr->mode.mode & MODE_FREEINVITE ? ALL_MEMBERS : ONLY_CHANOPS,
+                                    chptr, form_str(RPL_KNOCK),
                                     me.name, name, name, source_p->name,
                                     source_p->username, source_p->host);