Now with added ANGRY MONKEYS.

[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 32c19ccc948547881fe36f446b6f1a0743c81583..d6f6826a974af40fb9e0f5a646bcaa7c41010d61 100644 (file)
--- a/src/modules/m_spy.cpp
+++ b/src/modules/m_spy.cpp
@@ -28,11 +28,7 @@ using namespace std;
 #include <deque>
 #include "globals.h"
 #include "inspircd_config.h"
-#ifdef GCC3
 #include <ext/hash_map>
-#else
-#include <hash_map>
-#endif
 #include "users.h" 
 #include "channels.h"
 #include "modules.h"
@@ -48,12 +44,7 @@ using namespace std;
 #include "cull_list.h"
 #include "aes.h"
 
-#ifdef GCC3
 #define nspace __gnu_cxx
-#else
-#define nspace std
-#endif
-
 
 static Server *Srv;
 
@@ -99,9 +90,10 @@ class cmd_spylist : public command_t
        cmd_spylist () : command_t("SPYLIST", 'o', 0)
        {
                this->source = "m_spy.so";
+               syntax = "";
        }
 
-       void Handle (char **parameters, int pcnt, userrec *user)
+       void Handle (const char** parameters, int pcnt, userrec *user)
        {
                WriteOpers("*** Oper %s used SPYLIST to list +s/+p channels and keys.",user->nick);
                WriteServ(user->fd,"321 %s Channel :Users Name",user->nick);
@@ -116,37 +108,38 @@ class cmd_spylist : public command_t
 class cmd_spynames : public command_t
 {
   public:
-         cmd_spynames () : command_t("SPYNAMES", 'o', 0)
-         {
-                 this->source = "m_spy.so";
-         }
-
-         void Handle (char **parameters, int pcnt, userrec *user)
-         {
-                 chanrec* c;
-
-                 if (!pcnt)
-                 {
-                         WriteServ(user->fd,"366 %s * :End of /NAMES list.",user->nick);
-                         return;
-                 }
-
-                 if (ServerInstance->Parser->LoopCall(this,parameters,pcnt,user,0,pcnt-1,0))
-                         return;
-
-                 WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]);
-
-                 c = FindChan(parameters[0]);
-                 if (c)
-                 {
-                         spy_userlist(user,c);
-                         WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
-                 }
-                 else
-                 {
-                         WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
-                 }
-         }
+       cmd_spynames () : command_t("SPYNAMES", 'o', 0)
+       {
+               this->source = "m_spy.so";
+               syntax = "{<channel>{,<channel>}}";
+       }
+
+       void Handle (const char** parameters, int pcnt, userrec *user)
+       {
+               chanrec* c;
+
+               if (!pcnt)
+               {
+                       WriteServ(user->fd,"366 %s * :End of /NAMES list.",user->nick);
+                       return;
+               }
+
+               if (ServerInstance->Parser->LoopCall(user, this, parameters, pcnt, 1))
+                       return;
+
+               WriteOpers("*** Oper %s used SPYNAMES to view the users on %s",user->nick,parameters[0]);
+
+               c = FindChan(parameters[0]);
+               if (c)
+               {
+                       spy_userlist(user,c);
+                       WriteServ(user->fd,"366 %s %s :End of /NAMES list.", user->nick, c->name);
+               }
+               else
+               {
+                       WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
+               }
+       }
 };
 
 class ModuleSpy : public Module