Annotations

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

diff --git a/src/modules/m_watch.cpp b/src/modules/m_watch.cpp
index 8e6b2c50ca5d003ad4420142da70694fdfcebffd..09dc8d384b5ee69c44fee633bbfee94bf78deac7 100644 (file)
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -22,14 +22,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+
 #include "hashcomp.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for the /watch command */
 
-static Server *Srv;
-extern InspIRCd* ServerInstance;
+
+
 
 class watchentry : public classbase
 {
@@ -44,13 +44,13 @@ watchlist watches;
 class cmd_watch : public command_t
 {
  public:
-       cmd_watch() : command_t("WATCH",0,0)
+       cmd_watch (InspIRCd* Instance) : command_t(Instance,"WATCH",0,0)
        {
                this->source = "m_watch.so";
                syntax = "[C|L|S]|[+|-<nick>]";
        }
 
-       void Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
        {
                if (!pcnt)
                {
@@ -130,6 +130,11 @@ class cmd_watch : public command_t
                                {
                                        // removing an item from the list
                                        nick++;
+                                       if (!ServerInstance->IsNick(nick))
+                                       {
+                                               user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick);
+                                               return CMD_FAILURE;
+                                       }
                                        irc::string n1 = nick;
                                        for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
                                        {
@@ -144,7 +149,7 @@ class cmd_watch : public command_t
                                                        }
                                                        else
                                                        {
-                                                                user->WriteServ("602 %s %s * * 0 :stopped watching",user->nick,b->target.c_str());
+                                                               user->WriteServ("602 %s %s * * 0 :stopped watching",user->nick,b->target.c_str());
                                                        }
                                                        if (n1 == n2)
                                                        {
@@ -158,6 +163,11 @@ class cmd_watch : public command_t
                                else if (nick[0] == '+')
                                {
                                        nick++;
+                                       if (!ServerInstance->IsNick(nick))
+                                       {
+                                               user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick);
+                                               return CMD_FAILURE;
+                                       }
                                        irc::string n1 = nick;
                                        bool exists = false;
                                        for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
@@ -179,7 +189,7 @@ class cmd_watch : public command_t
                                                w->watcher = user;
                                                w->target = nick;
                                                watches.push_back(w);
-                                               log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick);
+                                               ServerInstance->Log(DEBUG,"*** Added %s to watchlist of %s",nick,user->nick);
                                        }
                                        userrec* a = ServerInstance->FindNick(nick);
                                        if (a)
@@ -193,7 +203,8 @@ class cmd_watch : public command_t
                                }
                        }
                }
-               return;
+               /* So that spanningtree doesnt pass the WATCH commands to the network! */
+               return CMD_FAILURE;
        }
 };
 
@@ -202,22 +213,22 @@ class Modulewatch : public Module
        cmd_watch* mycommand;
  public:
 
-       Modulewatch(Server* Me)
+       Modulewatch(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mycommand = new cmd_watch();
-               Srv->AddCommand(mycommand);
+               
+               mycommand = new cmd_watch(ServerInstance);
+               ServerInstance->AddCommand(mycommand);
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserQuit] = List[I_OnGlobalConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
+               List[I_OnUserQuit] = List[I_OnPostConnect] = List[I_OnUserPostNick] = List[I_On005Numeric] = 1;
        }
 
        virtual void OnUserQuit(userrec* user, const std::string &reason)
        {
-               log(DEBUG,"*** WATCH: On global quit: user %s",user->nick);
+               ServerInstance->Log(DEBUG,"*** WATCH: On global quit: user %s",user->nick);
                irc::string n2 = user->nick;
                for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
                {
@@ -225,7 +236,7 @@ class Modulewatch : public Module
                        irc::string n1 = a->target.c_str();
                        if (n1 == n2)
                        {
-                               log(DEBUG,"*** WATCH: On global quit: user %s is in notify of %s",user->nick,a->watcher->nick);
+                               ServerInstance->Log(DEBUG,"*** WATCH: On global quit: user %s is in notify of %s",user->nick,a->watcher->nick);
                                a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,user->nick,user->ident,user->dhost,time(NULL));
                        }
                }
@@ -247,17 +258,17 @@ class Modulewatch : public Module
                }
        }
 
-       virtual void OnGlobalConnect(userrec* user)
+       virtual void OnPostConnect(userrec* user)
        {
                irc::string n2 = user->nick;
-               log(DEBUG,"*** WATCH: On global connect: user %s",user->nick);
+               ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s",user->nick);
                for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
                {
                        watchentry* a = (watchentry*)(*q);
                        irc::string n1 = a->target.c_str();
                        if (n1 == n2)
                        {
-                               log(DEBUG,"*** WATCH: On global connect: user %s is in notify of %s",user->nick,a->watcher->nick);
+                               ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s is in notify of %s",user->nick,a->watcher->nick);
                                a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age);
                        }
                }
@@ -267,7 +278,7 @@ class Modulewatch : public Module
        {
                irc::string n2 = oldnick.c_str();
                irc::string n3 = user->nick;
-               log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick);
+               ServerInstance->Log(DEBUG,"*** WATCH: On global nickchange: old nick: %s new nick: %s",oldnick.c_str(),user->nick);
                for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
                {
                        watchentry* a = (watchentry*)(*q);
@@ -275,13 +286,13 @@ class Modulewatch : public Module
                        // changed from a nick on the watchlist to one that isnt
                        if (n1 == n2)
                        {
-                               log(DEBUG,"*** WATCH: On global nickchange: old nick %s was on notify list of %s",oldnick.c_str(),a->watcher->nick);
+                               ServerInstance->Log(DEBUG,"*** WATCH: On global nickchange: old nick %s was on notify list of %s",oldnick.c_str(),a->watcher->nick);
                                a->watcher->WriteServ("601 %s %s %s %s %lu :went offline",a->watcher->nick,oldnick.c_str(),user->ident,user->dhost,time(NULL));
                        }
                        else if (n1 == n3)
                        {
                                // changed from a nick not on notify to one that is
-                               log(DEBUG,"*** WATCH: On global nickchange: new nick %s is on notify list of %s",user->nick,a->watcher->nick);
+                               ServerInstance->Log(DEBUG,"*** WATCH: On global nickchange: new nick %s is on notify list of %s",user->nick,a->watcher->nick);
                                a->watcher->WriteServ("600 %s %s %s %s %lu :arrived online",a->watcher->nick,user->nick,user->ident,user->dhost,user->age);
                        }
                }
@@ -315,7 +326,7 @@ class ModulewatchFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new Modulewatch(Me);
        }