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 62b0961b8458b46111a466308b4f03dfe4e9470f..e70645161ca42779333bdfdfbf9d3bc023e7120b 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,21 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// Globops and +g support module by C.J.Edwards
 
-#include "inspircd.h"
+// Globops and snomask +g module by C.J.Edwards
 
-/* $ModDesc: Provides support for GLOBOPS and user mode +g */
+#include "inspircd.h"
 
 /** Handle /GLOBOPS
  */
@@ -24,51 +30,31 @@ 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->WriteToSnoMask('g',line);
-
-               /* route it (ofc :p) */
+               ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
                return CMD_SUCCESS;
        }
-
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
-       {
-               return ROUTE_BROADCAST;
-       }
 };
 
 class ModuleGlobops : public Module
 {
        CommandGlobops cmd;
  public:
-       ModuleGlobops()
-               : cmd(this)
-       {
-               ServerInstance->AddCommand(&cmd);
-               ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
-
-       }
+       ModuleGlobops() : cmd(this) {}
 
-       virtual ~ModuleGlobops()
+       void init() CXX11_OVERRIDE
        {
-               ServerInstance->SNO->DisableSnomask('g');
+               ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides support for GLOBOPS and user mode +g", VF_COMMON | VF_VENDOR);
+               return Version("Provides the GLOBOPS command and snomask 'g'", VF_VENDOR);
        }
-
 };
 
 MODULE_INIT(ModuleGlobops)