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 5d01d59831197bba3bb52d7f95cb6c09c765a1db..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-2008 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.
@@ -47,17 +47,22 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-
+       bool ShowWhoisFromOpers;
        SeeWhois* sw;
 
  public:
 
        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", "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()
@@ -71,28 +76,15 @@ class ModuleShowwhois : public Module
                return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnRehash(User *user, const std::string &parameter)
-       {
-               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))
                {
+                       if (!ShowWhoisFromOpers && IS_OPER(source))
+                               return;
+
                        std::string wmsg = "*** ";
-                       wmsg += source->nick + "(" + source->ident + "@";
+                       wmsg += source->nick + " (" + source->ident + "@";
 
                        if (dest->HasPrivPermission("users/auspex"))
                        {
@@ -111,7 +103,7 @@ class ModuleShowwhois : public Module
                        }
                        else
                        {
-                               std::string msg = std::string(":") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
+                               std::string msg = std::string("::") + dest->server + " NOTICE " + dest->nick + " :" + wmsg;
                                ServerInstance->PI->PushToClient(dest, msg);
                        }
                }