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 bcf2a25ac9b28b44deb4c28d1eceac67d325d220..6e1897aa27efe1820d48c5f3829708d15647bfc4 100644 (file)
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -30,11 +30,11 @@ using namespace std;
 #include "inspircd.h"
 #include "wildcard.h"
 
-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);
@@ -71,7 +71,7 @@ class cmd_spylist : public command_t
                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);
@@ -82,6 +82,9 @@ class cmd_spylist : public command_t
                        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;
        }
 };
 
@@ -94,24 +97,23 @@ class cmd_spynames : public command_t
                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);
                }
@@ -119,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;
        }
 };