Merge pull request #1162 from SaberUK/insp20+fix-deinstall

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

diff --git a/src/modules/m_maphide.cpp b/src/modules/m_maphide.cpp
index 299db381fe1079928cb8c819e9e633d25108cc6f..546e342ae36180d4644921501689e8b6c24b6f3f 100644 (file)
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -1,16 +1,22 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
  *
- * 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: Hide /MAP and /LINKS in the same form as ircu (mostly useless) */
@@ -19,22 +25,21 @@ class ModuleMapHide : public Module
 {
        std::string url;
  public:
-       ModuleMapHide()
+       void init()
        {
                Implementation eventlist[] = { I_OnPreCommand, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
                OnRehash(NULL);
        }
 
        void OnRehash(User* user)
        {
-               ConfigReader MyConf;
-               url = MyConf.ReadValue("security", "maphide", 0);
+               url = ServerInstance->Config->ConfValue("security")->getString("maphide");
        }
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               if (!IS_OPER(user) && !url.empty() && (command == "MAP" || command == "LINKS"))
+               if (validated && !IS_OPER(user) && !url.empty() && (command == "MAP" || command == "LINKS"))
                {
                        user->WriteServ("NOTICE %s :/%s has been disabled; visit %s", user->nick.c_str(), command.c_str(), url.c_str());
                        return MOD_RES_DENY;