Add <showwhois:opersonly>, allows server admins to unlock umode +W use for regular...

[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 c4fea4e392b3baa31bf1eba460924317e43f40ba..5d01d59831197bba3bb52d7f95cb6c09c765a1db 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -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,63 +47,76 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-       
+
        SeeWhois* sw;
 
  public:
 
-       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
-               
-               sw = new SeeWhois(ServerInstance);
-               ServerInstance->AddMode(sw, 'W');
+               sw = NULL;
+               OnRehash(NULL, "");
+               Implementation eventlist[] = { I_OnWhois, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        ~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 OnRehash(User *user, const std::string &parameter)
        {
-               if ((dest->IsModeSet('W')) && (source != dest))
+               ConfigReader conf(ServerInstance);
+               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true);
+
+               if (sw)
                {
-                       dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
+                       ServerInstance->Modes->DelMode(sw);
+                       delete sw;                      
                }
-       }
 
-};
+               sw = new SeeWhois(ServerInstance, OpersOnly);
+               if (!ServerInstance->Modes->AddMode(sw))
+                       throw ModuleException("Could not add new modes!");
+       }
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-       public:
-               ModuleShowwhoisFactory()
+       virtual void OnWhois(User* source, User* dest)
+       {
+               if ((dest->IsModeSet('W')) && (source != dest))
                {
-               }
+                       std::string wmsg = "*** ";
+                       wmsg += source->nick + "(" + source->ident + "@";
 
-               ~ModuleShowwhoisFactory()
-               {
-               }
+                       if (dest->HasPrivPermission("users/auspex"))
+                       {
+                               wmsg += source->host;
+                       }
+                       else
+                       {
+                               wmsg += source->dhost;
+                       }
 
-               virtual Module* CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleShowwhois(Me);
+                       wmsg += ") did a /whois on you";
+
+                       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)