Someone is getting slapped for this; the new hidesplits/hidebans behavior doesn't...

[user/henk/code/inspircd.git] / src / modules / m_spy.cpp

diff --git a/src/modules/m_spy.cpp b/src/modules/m_spy.cpp
index 55b3a650c83d537a2ac73d8cf8018174cc5f3f7e..de48284ba64a1926242009b704fcf6dde945865d 100644 (file)
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -19,112 +16,116 @@
  * WHOIS, WHICH IS SUPPORTED BY MOST IRCDS IN CORE.
  */
 
-using namespace std;
-
 /* $ModDesc: Provides SPYLIST and SPYNAMES capability, allowing opers to see who's in +s channels */
 
-#include <stdio.h>
-#include <vector>
-#include <deque>
-#include "globals.h"
 #include "inspircd_config.h"
-#include <ext/hash_map>
 #include "users.h" 
 #include "channels.h"
 #include "modules.h"
-#include "commands.h"
-#include "socket.h"
-
 #include "inspircd.h"
-#include "inspstring.h"
-#include "hashcomp.h"
-#include "xline.h"
-#include "typedefs.h"
-#include "cull_list.h"
-#include "aes.h"
+#include "wildcard.h"
 
-#define nspace __gnu_cxx
-
-void spy_userlist(userrec *user,chanrec *c)
+void spy_userlist(userrec *user, chanrec *c)
 {
-       static char list[MAXBUF];
+       char list[MAXBUF];
+       size_t dlen, curlen;
 
-       if ((!c) || (!user))
-               return;
+       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
 
-       snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+       int numusers = 0;
+       char* ptr = list + dlen;
 
        CUList *ulist= c->GetUsers();
+
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               strlcat(list,c->GetStatusChar(i->second),MAXBUF);
-               strlcat(list,i->second->nick,MAXBUF);
-               strlcat(list," ",MAXBUF);
-               if (strlen(list)>(480-NICKMAX))
+               size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", c->GetPrefixChar(i->second), i->second->nick);
+
+               curlen += ptrlen;
+               ptr += ptrlen;
+
+               numusers++;
+
+               if (curlen > (480-NICKMAX))
                {
-                       /* list overflowed into
-                        * multiple numerics */
+                       /* list overflowed into multiple numerics */
                        user->WriteServ(std::string(list));
-                       snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+
+                       /* reset our lengths */
+                       dlen = curlen = snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
+                       ptr = list + dlen;
+
+                       ptrlen = 0;
+                       numusers = 0;
                }
        }
+
        /* if whats left in the list isnt empty, send it */
-       if (list[strlen(list)-1] != ':')
+       if (numusers)
        {
                user->WriteServ(std::string(list));
        }
-}
 
+       user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
 
+}
 
+/** Handle /SPYLIST
+ */
 class cmd_spylist : public command_t
 {
   public:
- cmd_spylist (InspIRCd* Instance) : command_t(Instance,"SPYLIST", 'o', 0)
+       cmd_spylist (InspIRCd* Instance) : command_t(Instance,"SPYLIST", 'o', 0)
        {
                this->source = "m_spy.so";
                syntax = "";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                ServerInstance->WriteOpers("*** Oper %s used SPYLIST to list +s/+p channels and keys.",user->nick);
                user->WriteServ("321 %s Channel :Users Name",user->nick);
-               for (chan_hash::const_iterator i = ServerInstance->chanlist.begin(); i != ServerInstance->chanlist.end(); i++)
+               for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
                {
+                       if (pcnt && !match(i->second->name, parameters[0]))
+                               continue;
                        user->WriteServ("322 %s %s %d :[+%s] %s",user->nick,i->second->name,i->second->GetUserCounter(),i->second->ChanModes(true),i->second->topic);
                }
                user->WriteServ("323 %s :End of channel list.",user->nick);
+
+               /* Dont send out across the network */
+               return CMD_FAILURE;
        }
 };
 
+/** Handle /SPYNAMES
+ */
 class cmd_spynames : public command_t
 {
   public:
- cmd_spynames (InspIRCd* Instance) : command_t(Instance,"SPYNAMES", 'o', 0)
+       cmd_spynames (InspIRCd* Instance) : command_t(Instance,"SPYNAMES", 'o', 0)
        {
                this->source = "m_spy.so";
                syntax = "{<channel>{,<channel>}}";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
-               chanrec* c;
+               chanrec* c = NULL;
 
                if (!pcnt)
                {
                        user->WriteServ("366 %s * :End of /NAMES list.",user->nick);
-                       return;
+                       return CMD_FAILURE;
                }
 
-               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1))
-                       return;
-
-               ServerInstance->WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]);
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 0))
+                       return CMD_FAILURE;
 
                c = ServerInstance->FindChan(parameters[0]);
                if (c)
                {
+                       ServerInstance->WriteOpers("*** Oper %s used SPYNAMES to view the users on %s", user->nick, parameters[0]);
                        spy_userlist(user,c);
                        user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, c->name);
                }
@@ -132,6 +133,8 @@ class cmd_spynames : public command_t
                {
                        user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -155,7 +158,7 @@ class ModuleSpy : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 0, 0, 0, VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_VENDOR, API_VERSION);
        }
 };