Only send ACCOUNT and CHGHOST to clients that have sent NICK/USER.

[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 8377a255ef6bf140b135fc4147072524306a0efe..b583e22ffea494af4c94917672b33a8533019263 100644 (file)
--- 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,11 +30,17 @@ class CommandGlobops : public Command
  public:
        CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
        {
-               flags_needed = 'o'; syntax = "<any-text>";
+               flags_needed = 'o'; syntax = ":<message>";
        }
 
-       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
+               if (parameters[0].empty())
+               {
+                       user->WriteNumeric(ERR_NOTEXTTOSEND, "No text to send");
+                       return CMD_FAILURE;
+               }
+
                ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
                return CMD_SUCCESS;
        }
@@ -50,13 +54,12 @@ class ModuleGlobops : public Module
 
        void init() CXX11_OVERRIDE
        {
-               ServerInstance->Modules->AddService(cmd);
                ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
        }
 
        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);
        }
 };