Merge pull request #142 from attilamolnar/insp20+sestatsfix

[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..dc53f2f0c22d74baa3584a1719108d747914c3e1 100644 (file)
--- a/src/modules/m_swhois.cpp
+++ b/src/modules/m_swhois.cpp
@@ -1,19 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2005-2006 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-/* $ModDesc: Provides the SWHOIS command which allows setting of arbitary WHOIS lines */
+/* $ModDesc: Provides the SWHOIS command which allows setting of arbitrary WHOIS lines */
 
 /** Handle /SWHOIS
  */
@@ -24,7 +36,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);
        }
 
@@ -100,38 +112,13 @@ class ModuleSWhois : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void OnPostCommand(const std::string &command, const std::vector<std::string> &params, User *user, CmdResult result, const std::string &original_line)
+       void OnPostCommand(const std::string &command, const std::vector<std::string> &params, LocalUser *user, CmdResult result, const std::string &original_line)
        {
                if ((command != "OPER") || (result != CMD_SUCCESS))
                        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 +133,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 arbitrary WHOIS lines", VF_OPTCOMMON | VF_VENDOR);
        }
 };