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 30129036338e64f0353bec2f487170d9c629dd98..e70645161ca42779333bdfdfbf9d3bc023e7120b 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -1,124 +1,60 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
-
-// Globops and +g support module by C.J.Edwards
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for unreal-style GLOBOPS and umode +g */
+// Globops and snomask +g module by C.J.Edwards
 
-Server *Srv;
+#include "inspircd.h"
 
-class cmd_globops : public command_t
+/** Handle /GLOBOPS
+ */
+class CommandGlobops : public Command
 {
  public:
-       cmd_globops () : command_t("GLOBOPS",'o',1)
+       CommandGlobops(Module* Creator) : Command(Creator,"GLOBOPS", 1,1)
        {
-               this->source = "m_globops.so";
+               flags_needed = 'o'; syntax = ":<message>";
        }
-       
-       void Handle (char **parameters, int pcnt, userrec *user)
+
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               std::string line = "*** GLOBOPS - From " + std::string(user->nick) + ": ";
-               for (int i = 0; i < pcnt; i++)
-               {
-                       line = line + std::string(parameters[i]) + " ";
-               }
-               Srv->SendToModeMask("og",WM_AND,line);
+               ServerInstance->SNO->WriteGlobalSno('g', "From " + user->nick + ": " + parameters[0]);
+               return CMD_SUCCESS;
        }
 };
 
-
 class ModuleGlobops : public Module
 {
-       cmd_globops* mycommand;
+       CommandGlobops cmd;
  public:
-       ModuleGlobops(Server* Me)
-               : Module::Module(Me)
-       {
-               Srv = Me;
-               
-               if (!Srv->AddExtendedMode('g',MT_CLIENT,true,0,0))
-               {
-                       Srv->Log(DEFAULT,"*** m_globops: ERROR, failed to allocate user mode +g!");
-                       printf("Could not claim usermode +g for this module!");
-                       return;
-               }
-               else
-               {
-                       mycommand = new cmd_globops();
-                       Srv->AddCommand(mycommand);
-               }
-       }
-       
-       virtual ~ModuleGlobops()
-       {
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,0,0,1,VF_STATIC|VF_VENDOR);
-       }
-       
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'g') && (type == MT_CLIENT))
-               {
-                       // we dont actually do anything with the mode in this module -
-                       // just tell the core its been claimed and is ok to give users.                         
-                       return 1;
-               }
-               else
-               {
-                       // this mode isn't ours, we have to bail and return 0 to not handle it.
-                       return 0;
-               }
-       }
-};
+       ModuleGlobops() : cmd(this) {}
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleGlobopsFactory : public ModuleFactory
-{
- public:
-       ModuleGlobopsFactory()
+       void init() CXX11_OVERRIDE
        {
+               ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
        }
-       
-       ~ModuleGlobopsFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleGlobops(Me);
+               return Version("Provides the GLOBOPS command and snomask 'g'", VF_VENDOR);
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleGlobopsFactory;
-}
-
+MODULE_INIT(ModuleGlobops)