Weed out a few leftover server instances from before modules had ServerInstance....

[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 7c35fe08e669589398b3e55d4626dae846b3287e..04834634d278039320c97cefcff80d0bd7d66673 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
@@ -23,14 +20,10 @@
 class SeeWhois : public ModeHandler
 {
  public:
-       SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
+       SeeWhois(InspIRCd* Instance, bool IsOpersOnly) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, IsOpersOnly) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
-               /* Only opers can change other users modes */
-               if ((source != dest) && (!*source->oper))
-                       return MODEACTION_DENY;
-
                if (adding)
                {
                        if (!dest->IsModeSet('W'))
@@ -54,77 +47,68 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-       
+       bool ShowWhoisFromOpers;
        SeeWhois* sw;
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
-               
-               sw = new SeeWhois(ServerInstance);
-               if (!ServerInstance->AddMode(sw, 'W'))
+               ConfigReader conf(ServerInstance);
+               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+               ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+
+               sw = new SeeWhois(ServerInstance, OpersOnly);
+               if (!ServerInstance->Modes->AddMode(sw))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        ~ModuleShowwhois()
        {
                ServerInstance->Modes->DelMode(sw);
-               DELETE(sw);
-       }
-
-       void Implements(char* List)
-       {
-               List[I_OnWhois] = 1;
+               delete sw;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnWhois(userrec* source, userrec* dest)
+       virtual void OnWhois(User* source, User* dest)
        {
                if ((dest->IsModeSet('W')) && (source != dest))
                {
-                       if (IS_LOCAL(dest))
+                       if (!ShowWhoisFromOpers && IS_OPER(source))
+                               return;
+
+                       std::string wmsg = "*** ";
+                       wmsg += source->nick + " (" + source->ident + "@";
+
+                       if (dest->HasPrivPermission("users/auspex"))
                        {
-                               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+                               wmsg += source->host;
                        }
                        else
                        {
-                               std::deque<std::string> params;
-                               params.push_back(dest->nick);
-                               std::string msg = ":";
-                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-                               params.push_back(msg);
-                               Event ev((char *) &params, NULL, "send_push");
-                               ev.Send(ServerInstance);
+                               wmsg += source->dhost;
                        }
-               }
-       }
 
-};
+                       wmsg += ") did a /whois on you";
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-       public:
-               ModuleShowwhoisFactory()
-               {
-               }
-
-               ~ModuleShowwhoisFactory()
-               {
-               }
-
-               virtual Module* CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleShowwhois(Me);
+                       if (IS_LOCAL(dest))
+                       {
+                               dest->WriteServ("NOTICE %s :%s", dest->nick.c_str(), wmsg.c_str());
+                       }
+                       else
+                       {
+                               std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
+                               ServerInstance->PI->PushToClient(dest, msg);
+                       }
                }
+       }
 
 };
 
-extern "C" void* init_module()
-{
-       return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)