diff options
| -rw-r--r-- | conf/modules.conf.example | 4 | ||||
| -rw-r--r-- | src/modules/m_showwhois.cpp | 28 |
2 files changed, 11 insertions, 21 deletions
diff --git a/conf/modules.conf.example b/conf/modules.conf.example index f739895f2..67d17fbfc 100644 --- a/conf/modules.conf.example +++ b/conf/modules.conf.example @@ -1373,7 +1373,9 @@ #<module name="m_showwhois.so"> # # If you wish, you may also let users set this mode. Only opers with the -# users/auspex priv will see real hosts of people, though. +# users/auspex priv will see real hosts of people, though. This setting +# is not reloadable via /rehash, and will require /reloadmodule, as +# it directly affects the mode object itself. #<showwhois opersonly="yes"> #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp index 5d01d5983..fac5d124e 100644 --- a/src/modules/m_showwhois.cpp +++ b/src/modules/m_showwhois.cpp @@ -54,10 +54,14 @@ class ModuleShowwhois : public Module ModuleShowwhois(InspIRCd* Me) : Module(Me) { - sw = NULL; - OnRehash(NULL, ""); - Implementation eventlist[] = { I_OnWhois, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ConfigReader conf(ServerInstance); + bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true); + + 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() @@ -71,22 +75,6 @@ class ModuleShowwhois : public Module return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION); } - virtual void OnRehash(User *user, const std::string ¶meter) - { - ConfigReader conf(ServerInstance); - bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true); - - if (sw) - { - ServerInstance->Modes->DelMode(sw); - delete sw; - } - - sw = new SeeWhois(ServerInstance, OpersOnly); - if (!ServerInstance->Modes->AddMode(sw)) - throw ModuleException("Could not add new modes!"); - } - virtual void OnWhois(User* source, User* dest) { if ((dest->IsModeSet('W')) && (source != dest)) |