Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 2ef6d61d8f69b0f1bf6b0f93c93133b71055f103..e70645161ca42779333bdfdfbf9d3bc023e7120b 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -19,12 +19,10 @@
  */
 
 
-// Globops and +g support module by C.J.Edwards
+// Globops and snomask +g module by C.J.Edwards
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for GLOBOPS and user mode +g */
-
 /** Handle /GLOBOPS
  */
 class CommandGlobops : public Command
@@ -32,19 +30,12 @@ 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++)
-               {
-                       line = line + parameters[i] + " ";
-               }
-               ServerInstance->SNO->WriteGlobalSno('g',line);
-
+               ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
                return CMD_SUCCESS;
        }
 };
@@ -55,17 +46,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 user mode +g", VF_VENDOR);
+               return Version("Provides the GLOBOPS command and snomask 'g'", VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleGlobops)