X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_globops.cpp;h=b583e22ffea494af4c94917672b33a8533019263;hb=4e3d655dff6f8a5aed626475fbf19c2a7119c20b;hp=db55858d661565986d2b7a3bec8463b240bd5b02;hpb=90875afded8d80cc6c61d9f7804c1ba7a74e70a7;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index db55858d6..b583e22ff 100644
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -23,8 +23,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for GLOBOPS and snomask +g */
-
 /** Handle /GLOBOPS
  */
 class CommandGlobops : public Command
@@ -32,19 +30,18 @@ class CommandGlobops : public Command
  public:
 	CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
 	{
-		flags_needed = 'o'; syntax = "<any-text>";
-		TRANSLATE2(TR_TEXT, TR_END);
+		flags_needed = 'o'; syntax = ":<message>";
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		std::string line = "From " + std::string(user->nick) + ": ";
-		for (int i = 0; i < (int)parameters.size(); i++)
+		if (parameters[0].empty())
 		{
-			line = line + parameters[i] + " ";
+			user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
+			return CMD_FAILURE;
 		}
-		ServerInstance->SNO->WriteGlobalSno('g',line);
 
+		ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
 		return CMD_SUCCESS;
 	}
 };
@@ -55,17 +52,15 @@ class ModuleGlobops : public Module
  public:
 	ModuleGlobops() : cmd(this) {}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->AddCommand(&cmd);
 		ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Provides support for GLOBOPS and snomask +g", VF_VENDOR);
+		return Version("Provides the GLOBOPS command and snomask 'g'", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleGlobops)