Better error message for erroring on loading server cert - give certfile/keyfile...

[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 fac5d124e1bf5f02cb45cd3cd65acad8600c2ab3..e4e666a1d5e0b825568981923e9ed02ba0162835 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -47,7 +47,7 @@ class SeeWhois : public ModeHandler
 
 class ModuleShowwhois : public Module
 {
-
+       bool ShowWhoisFromOpers;
        SeeWhois* sw;
 
  public:
@@ -55,7 +55,8 @@ class ModuleShowwhois : public Module
        ModuleShowwhois(InspIRCd* Me) : Module(Me)
        {
                ConfigReader conf(ServerInstance);
-               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", 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))
@@ -79,6 +80,9 @@ class ModuleShowwhois : public Module
        {
                if ((dest->IsModeSet('W')) && (source != dest))
                {
+                       if (!ShowWhoisFromOpers && IS_OPER(source))
+                               return;
+
                        std::string wmsg = "*** ";
                        wmsg += source->nick + "(" + source->ident + "@";