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 450d9470c7c2c1dd312d5cd8ba26618d5cd438ea..09dc8d384b5ee69c44fee633bbfee94bf78deac7 100644 (file)
--- a/src/modules/m_watch.cpp
+++ b/src/modules/m_watch.cpp
@@ -44,13 +44,13 @@ watchlist watches;
 class cmd_watch : public command_t
 {
  public:
- cmd_watch (InspIRCd* Instance) : command_t(Instance,"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)
                {
@@ -133,7 +133,7 @@ class cmd_watch : public command_t
                                        if (!ServerInstance->IsNick(nick))
                                        {
                                                user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick);
-                                               return;
+                                               return CMD_FAILURE;
                                        }
                                        irc::string n1 = nick;
                                        for (watchlist::iterator q = watches.begin(); q != watches.end(); q++)
@@ -166,7 +166,7 @@ class cmd_watch : public command_t
                                        if (!ServerInstance->IsNick(nick))
                                        {
                                                user->WriteServ("942 %s %s :Invalid nickname",user->nick,nick);
-                                               return;
+                                               return CMD_FAILURE;
                                        }
                                        irc::string n1 = nick;
                                        bool exists = false;
@@ -203,7 +203,8 @@ class cmd_watch : public command_t
                                }
                        }
                }
-               return;
+               /* So that spanningtree doesnt pass the WATCH commands to the network! */
+               return CMD_FAILURE;
        }
 };
 
@@ -222,7 +223,7 @@ class Modulewatch : public Module
 
        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)
@@ -257,7 +258,7 @@ class Modulewatch : public Module
                }
        }
 
-       virtual void OnGlobalConnect(userrec* user)
+       virtual void OnPostConnect(userrec* user)
        {
                irc::string n2 = user->nick;
                ServerInstance->Log(DEBUG,"*** WATCH: On global connect: user %s",user->nick);