Merge branch 'insp3' into master.

1 files changed, 23 insertions, 23 deletions

diff --git a/src/modules/m_globalload.cpp b/src/modules/m_globalload.cpp
index 7828411d7..03b83654d 100644
--- a/src/modules/m_globalload.cpp
+++ b/src/modules/m_globalload.cpp
@@ -26,14 +26,14 @@
 
 #include "inspircd.h"
 
-/** Handle /GLOADMODULE
- */
-class CommandGloadmodule : public Command
+class CommandGLoadModule : public Command
 {
  public:
-	CommandGloadmodule(Module* Creator) : Command(Creator,"GLOADMODULE", 1)
+	CommandGLoadModule(Module* Creator)
+		: Command(Creator,"GLOADMODULE", 1)
 	{
 		access_needed = CmdAccess::OPERATOR;
+		allow_empty_last_param = false;
 		syntax = { "<modulename> [<servermask>]" };
 	}
 
@@ -46,11 +46,11 @@ class CommandGloadmodule : public Command
 			if (ServerInstance->Modules.Load(parameters[0].c_str()))
 			{
 				ServerInstance->SNO.WriteToSnoMask('a', "NEW MODULE '%s' GLOBALLY LOADED BY '%s'",parameters[0].c_str(), user->nick.c_str());
-				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
+				user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Module successfully loaded.");
 			}
 			else
 			{
-				user->WriteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
+				user->WriteRemoteNumeric(ERR_CANTLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
 			}
 		}
 		else
@@ -65,14 +65,14 @@ class CommandGloadmodule : public Command
 	}
 };
 
-/** Handle /GUNLOADMODULE
- */
-class CommandGunloadmodule : public Command
+class CommandGUnloadModule : public Command
 {
  public:
-	CommandGunloadmodule(Module* Creator) : Command(Creator,"GUNLOADMODULE", 1)
+	CommandGUnloadModule(Module* Creator)
+		: Command(Creator,"GUNLOADMODULE", 1)
 	{
 		access_needed = CmdAccess::OPERATOR;
+		allow_empty_last_param = false;
 		syntax = { "<modulename> [<servermask>]" };
 	}
 
@@ -80,7 +80,7 @@ class CommandGunloadmodule : public Command
 	{
 		if (InspIRCd::Match(parameters[0], "core_*" DLL_EXTENSION, ascii_case_insensitive_map))
 		{
-			user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
+			user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], "You cannot unload core commands!");
 			return CmdResult::FAILURE;
 		}
 
@@ -98,7 +98,7 @@ class CommandGunloadmodule : public Command
 				}
 				else
 				{
-					user->WriteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
+					user->WriteRemoteNumeric(ERR_CANTUNLOADMODULE, parameters[0], ServerInstance->Modules.LastError());
 				}
 			}
 			else
@@ -116,14 +116,14 @@ class CommandGunloadmodule : public Command
 	}
 };
 
-/** Handle /GRELOADMODULE
- */
-class CommandGreloadmodule : public Command
+class CommandGReloadModule : public Command
 {
  public:
-	CommandGreloadmodule(Module* Creator) : Command(Creator, "GRELOADMODULE", 1)
+	CommandGReloadModule(Module* Creator)
+		: Command(Creator, "GRELOADMODULE", 1)
 	{
 		access_needed = CmdAccess::OPERATOR;
+		allow_empty_last_param = false;
 		syntax = { "<modulename> [<servermask>]" };
 	}
 
@@ -141,7 +141,7 @@ class CommandGreloadmodule : public Command
 			}
 			else
 			{
-				user->WriteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
+				user->WriteRemoteNumeric(RPL_LOADEDMODULE, parameters[0], "Could not find module by that name");
 				return CmdResult::FAILURE;
 			}
 		}
@@ -160,16 +160,16 @@ class CommandGreloadmodule : public Command
 class ModuleGlobalLoad : public Module
 {
  private:
-	CommandGloadmodule cmd1;
-	CommandGunloadmodule cmd2;
-	CommandGreloadmodule cmd3;
+	CommandGLoadModule cmdgloadmodule;
+	CommandGUnloadModule cmdgunloadmodule;
+	CommandGReloadModule cmdgreloadmodule;
 
  public:
 	ModuleGlobalLoad()
 		: Module(VF_VENDOR | VF_COMMON, "Adds the /GLOADMODULE, /GRELOADMODULE, and /GUNLOADMODULE commands which allows server operators to load, reload, and unload modules on remote servers.")
-		, cmd1(this)
-		, cmd2(this)
-		, cmd3(this)
+		, cmdgloadmodule(this)
+		, cmdgunloadmodule(this)
+		, cmdgreloadmodule(this)
 	{
 	}
 };