Annotations

[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 041814f9b87e50726b171b325a7e28defda61c39..6e1897aa27efe1820d48c5f3829708d15647bfc4 100644 (file)
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -23,39 +23,18 @@ 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 "helperfuncs.h"
 #include "inspircd.h"
-#include "inspstring.h"
-#include "hashcomp.h"
-#include "message.h"
-#include "xline.h"
-#include "typedefs.h"
-#include "cull_list.h"
-#include "aes.h"
+#include "wildcard.h"
 
-#define nspace __gnu_cxx
-
-static Server *Srv;
-
-extern InspIRCd* ServerInstance;
-extern chan_hash chanlist;
-
-void spy_userlist(userrec *user,chanrec *c)
+void spy_userlist(userrec *user, chanrec *c)
 {
        static char list[MAXBUF];
 
-       if ((!c) || (!user))
+       if (!c || !user)
                return;
 
        snprintf(list,MAXBUF,"353 %s = %s :", user->nick, c->name);
@@ -63,7 +42,7 @@ void spy_userlist(userrec *user,chanrec *c)
        CUList *ulist= c->GetUsers();
        for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
        {
-               strlcat(list,cmode(i->second,c),MAXBUF);
+               strlcat(list,c->GetPrefixChar(i->second),MAXBUF);
                strlcat(list,i->second->nick,MAXBUF);
                strlcat(list," ",MAXBUF);
                if (strlen(list)>(480-NICKMAX))
@@ -86,51 +65,55 @@ void spy_userlist(userrec *user,chanrec *c)
 class cmd_spylist : public command_t
 {
   public:
-       cmd_spylist () : command_t("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 = chanlist.begin(); i != 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;
        }
 };
 
 class cmd_spynames : public command_t
 {
   public:
-       cmd_spynames () : command_t("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]);
+                       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);
                }
@@ -138,6 +121,8 @@ class cmd_spynames : public command_t
                {
                        user->WriteServ("401 %s %s :No such nick/channel",user->nick, parameters[0]);
                }
+
+               return CMD_FAILURE;
        }
 };
 
@@ -146,13 +131,13 @@ class ModuleSpy : public Module
        cmd_spylist *mycommand;
        cmd_spynames *mycommand2;
  public:
-       ModuleSpy(Server* Me) : Module::Module(Me)
+       ModuleSpy(InspIRCd* Me) : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_spylist();
-               mycommand2 = new cmd_spynames();
-               Srv->AddCommand(mycommand);
-               Srv->AddCommand(mycommand2);
+               
+               mycommand = new cmd_spylist(ServerInstance);
+               mycommand2 = new cmd_spynames(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(mycommand2);
        }
        
        virtual ~ModuleSpy()
@@ -177,7 +162,7 @@ class ModuleSpyFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleSpy(Me);
        }