Merge insp20

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

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 9a0074cb40164b50e2f1cc95aeb01a721d70be2c..2c936d5ea3dbff4cc53fbc51cee10c83ee88e54c 100644 (file)
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -22,8 +22,6 @@
  */
 
 
-/* $ModDesc: Allows global loading of a module. */
-
 #include "inspircd.h"
 
 /** Handle /GLOADMODULE
@@ -35,7 +33,6 @@ class CommandGloadmodule : public Command
        {
                flags_needed = 'o';
                syntax = "<modulename> [servermask]";
-               TRANSLATE3(TR_TEXT, TR_TEXT, TR_END);
        }
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
@@ -79,21 +76,33 @@ class CommandGunloadmodule : public Command
 
        CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
+               if (!ServerInstance->Config->ConfValue("security")->getBool("allowcoreunload") &&
+                       InspIRCd::Match(parameters[0], "cmd_*.so", ascii_case_insensitive_map))
+               {
+                       user->WriteNumeric(972, "%s %s :You cannot unload core commands!", user->nick.c_str(), parameters[0].c_str());
+                       return CMD_FAILURE;
+               }
+
                std::string servername = parameters.size() > 1 ? parameters[1] : "*";
 
                if (InspIRCd::Match(ServerInstance->Config->ServerName.c_str(), servername))
                {
                        Module* m = ServerInstance->Modules->Find(parameters[0]);
-                       if (m && ServerInstance->Modules->Unload(m))
+                       if (m)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-                               user->SendText(":%s 973 %s %s :Module successfully unloaded.",
-                                       ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+                               if (ServerInstance->Modules->Unload(m))
+                               {
+                                       ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBALLY UNLOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
+                                       user->SendText(":%s 973 %s %s :Module successfully unloaded.",
+                                               ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
+                               }
+                               else
+                               {
+                                       user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
+                               }
                        }
                        else
-                       {
-                               user->WriteNumeric(972, "%s %s :%s",user->nick.c_str(), parameters[0].c_str(), ServerInstance->Modules->LastError().c_str());
-                       }
+                               user->SendText(":%s 972 %s %s :No such module", ServerInstance->Config->ServerName.c_str(), user->nick.c_str(), parameters[0].c_str());
                }
                else
                        ServerInstance->SNO->WriteToSnoMask('a', "MODULE '%s' GLOBAL UNLOAD BY '%s' (not unloaded here)",parameters[0].c_str(), user->nick.c_str());
@@ -173,20 +182,19 @@ class ModuleGlobalLoad : public Module
        ModuleGlobalLoad()
                : cmd1(this), cmd2(this), cmd3(this)
        {
-               ServerInstance->AddCommand(&cmd1);
-               ServerInstance->AddCommand(&cmd2);
-               ServerInstance->AddCommand(&cmd3);
        }
 
-       ~ModuleGlobalLoad()
+       void init() CXX11_OVERRIDE
        {
+               ServerInstance->Modules->AddService(cmd1);
+               ServerInstance->Modules->AddService(cmd2);
+               ServerInstance->Modules->AddService(cmd3);
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Allows global loading of a module.", VF_COMMON | VF_VENDOR);
        }
 };
 
 MODULE_INIT(ModuleGlobalLoad)
-