Remove spanningtree override of /LUSERS

[user/henk/code/inspircd.git] / src / modules / m_swhois.cpp

diff --git a/src/modules/m_swhois.cpp b/src/modules/m_swhois.cpp
index 4465b0c89c61fc27619ec7f2834a185c6bf5c9c9..4c262c9caa6ce92a795bd62ad42c03f739659587 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -24,7 +24,7 @@ class CommandSwhois : public Command
        CommandSwhois(Module* Creator) : Command(Creator,"SWHOIS", 2,2), swhois("swhois", Creator)
        {
                flags_needed = 'o'; syntax = "<nick> :<swhois>";
-               Extensible::Register(&swhois);
+               ServerInstance->Extensions.Register(&swhois);
                TRANSLATE3(TR_NICK, TR_TEXT, TR_END);
        }
 
@@ -106,32 +106,7 @@ class ModuleSWhois : public Module
                        return;
                ConfigReader Conf;
 
-               std::string swhois;
-
-               for (int i = 0; i < Conf.Enumerate("oper"); i++)
-               {
-                       std::string name = Conf.ReadValue("oper", "name", i);
-
-                       if (name == params[0])
-                       {
-                               swhois = Conf.ReadValue("oper", "swhois", i);
-                               break;
-                       }
-               }
-
-               if (!swhois.length())
-               {
-                       for (int i = 0; i < Conf.Enumerate("type"); i++)
-                       {
-                               std::string type = Conf.ReadValue("type", "name", i);
-
-                               if (type == user->oper)
-                               {
-                                       swhois = Conf.ReadValue("type", "swhois", i);
-                                       break;
-                               }
-                       }
-               }
+               std::string swhois = user->oper->getConfig("swhois");
 
                if (!swhois.length())
                        return;
@@ -146,7 +121,7 @@ class ModuleSWhois : public Module
 
        Version GetVersion()
        {
-               return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides the SWHOIS command which allows setting of arbitary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
        }
 };