This module isn't supposed to be part of 2.0; it will be third-party until 2.1

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 9cfa76008c35bf7368d36ee2cbbafa97bae9e8b5..2d65d1669394d32c51b2158d4432db266403ca55 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -53,6 +53,7 @@ class WhoisNoticeCmd : public Command
  public:
        WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
        {
+               flags_needed = FLAG_SERVERONLY;
        }
 
        void HandleFast(User* dest, User* src)
@@ -65,9 +66,10 @@ class WhoisNoticeCmd : public Command
        CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                User* dest = ServerInstance->FindNick(parameters[0]);
+               User* source = ServerInstance->FindNick(parameters[1]);
 
-               if (IS_LOCAL(dest))
-                       HandleFast(dest, user);
+               if (IS_LOCAL(dest) && source)
+                       HandleFast(dest, source);
 
                return CMD_SUCCESS;
        }
@@ -100,12 +102,12 @@ class ModuleShowwhois : public Module
                delete sw;
        }
 
-       virtual Version GetVersion()
+       Version GetVersion()
        {
-               return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_COMMON|VF_VENDOR);
+               return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
        }
 
-       virtual void OnWhois(User* source, User* dest)
+       void OnWhois(User* source, User* dest)
        {
                if (!dest->IsModeSet('W') || source == dest)
                        return;
@@ -122,6 +124,7 @@ class ModuleShowwhois : public Module
                        std::vector<std::string> params;
                        params.push_back(dest->server);
                        params.push_back("WHOISNOTICE");
+                       params.push_back(source->uuid);
                        params.push_back(dest->uuid);
                        ServerInstance->PI->SendEncapsulatedData(params);
                }