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 f4b7cec463b1323d8ae31a5b2fdaa536477df154..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.
@@ -55,8 +55,8 @@ class ModuleShowwhois : public Module
        ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
                ConfigReader conf(ServerInstance);
-               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 0, true);
-               ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", 0, true);
+               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))
@@ -84,7 +84,7 @@ class ModuleShowwhois : public Module
                                return;
 
                        std::string wmsg = "*** ";
-                       wmsg += source->nick + "(" + source->ident + "@";
+                       wmsg += source->nick + " (" + source->ident + "@";
 
                        if (dest->HasPrivPermission("users/auspex"))
                        {
@@ -103,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);
                        }
                }