m_namedmodes Only show chan key to members and opers with channels/auspex

[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 b78cd2c7eca85028fb394509f98cc8b3718b6d7f..546e342ae36180d4644921501689e8b6c24b6f3f 100644 (file)
--- a/src/modules/m_maphide.cpp
+++ b/src/modules/m_maphide.cpp
@@ -25,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;