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

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

diff --git a/modules/m_testmask.c b/modules/m_testmask.c
index 2fa4eea8a741e4f04a995010edd8fcb87bfa77e2..304afab0b0f330c4019d960c2af09242ff0de874 100644 (file)
--- a/modules/m_testmask.c
+++ b/modules/m_testmask.c
@@ -1,6 +1,6 @@
 /*
  *  m_testmask.c: Shows the number of matching local and global clients
- *                for a user@host mask, helpful when setting GLINE's
+ *                for a user@host mask
  *
  *  Copyright (C) 2003 by W. Campbell
  *  Coypright (C) 2004 ircd-ratbox development team
@@ -29,7 +29,7 @@
  *  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  *  POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: m_testmask.c 2775 2006-11-27 11:45:31Z jilles $
+ *  $Id: m_testmask.c 3161 2007-01-25 07:23:01Z nenolod $
  *
  */
 
@@ -38,10 +38,10 @@
 #include "client.h"
 #include "common.h"     /* FALSE bleah */
 #include "ircd.h"
-#include "irc_string.h"
+#include "match.h"
 #include "numeric.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "msg.h"
@@ -57,7 +57,7 @@ struct Message testmask_msgtab = {
 };
 
 mapi_clist_av1 testmask_clist[] = { &testmask_msgtab, NULL };
-DECLARE_MODULE_AV1(testmask, NULL, NULL, testmask_clist, NULL, NULL, "$Revision: 2775 $");
+DECLARE_MODULE_AV1(testmask, NULL, NULL, testmask_clist, NULL, NULL, "$Revision: 3161 $");
 
 static const char *empty_sockhost = "255.255.255.255";
 static const char *spoofed_sockhost = "0";
@@ -71,8 +71,8 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
        int gcount = 0;
        char *name, *username, *hostname;
        const char *sockhost;
-       char *gecos = NULL, *mangle_gecos = NULL;
-       dlink_node *ptr;
+       char *gecos = NULL;
+       rb_dlink_node *ptr;
 
        name = LOCAL_COPY(parv[1]);
        collapse(name);
@@ -80,8 +80,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
        /* username is required */
        if((hostname = strchr(name, '@')) == NULL)
        {
-               sendto_one(source_p, ":%s NOTICE %s :Invalid parameters",
-                               me.name, source_p->name);
+               sendto_one_notice(source_p, ":Invalid parameters");
                return 0;
        }
 
@@ -98,8 +97,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
 
        if(EmptyString(username) || EmptyString(hostname))
        {
-               sendto_one(source_p, ":%s NOTICE %s :Invalid parameters",
-                               me.name, source_p->name);
+               sendto_one_notice(source_p, ":Invalid parameters");
                return 0;
        }
 
@@ -107,41 +105,9 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
        {
                gecos = LOCAL_COPY(parv[2]);
                collapse_esc(gecos);
-               if(strstr(gecos, "\\s"))
-               {
-                       char *tmp = LOCAL_COPY(gecos);
-                       char *orig = tmp;
-                       char *new = tmp; 
-                       while(*orig)
-                       {
-                               if(*orig == '\\' && *(orig + 1) != '\0')
-                               {
-                                       if(*(orig + 1) == 's')
-                                       {
-                                               *new++ = ' ';
-                                               orig += 2;   
-                                       }
-                                       /* otherwise skip that and the escaped
-                                        * character after it, so we dont mistake
-                                        * \\s as \s --fl
-                                        */
-                                       else
-                                       {   
-                                               *new++ = *orig++;
-                                               *new++ = *orig++;
-                                       }
-                               }
-                               else
-                                       *new++ = *orig++;
-                       }
-
-                       *new = '\0';
-                       mangle_gecos = LOCAL_COPY(tmp);
-               } else
-                       mangle_gecos = gecos;
        }
 
-       DLINK_FOREACH(ptr, global_client_list.head)
+       RB_DLINK_FOREACH(ptr, global_client_list.head)
        {
                target_p = ptr->data;
 
@@ -163,7 +129,7 @@ mo_testmask(struct Client *client_p, struct Client *source_p,
                        if(name && !match(name, target_p->name))
                                continue;
 
-                       if(mangle_gecos && !match_esc(mangle_gecos, target_p->info))
+                       if(gecos && !match_esc(gecos, target_p->info))
                                continue;
 
                        if(MyClient(target_p))