Some more text fixes and improvements (#1618).

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

diff --git a/src/modules/m_saquit.cpp b/src/modules/m_saquit.cpp
index 037b7016a914623e4ba23961edd3652085ff049b..ad3c857e099067ec647f5c63969b5e84fc388235 100644 (file)
--- a/src/modules/m_saquit.cpp
+++ b/src/modules/m_saquit.cpp
@@ -1,107 +1,83 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006-2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2004-2005 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/>.
  */
 
-#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for an SAQUIT command, exits user with a reason */
+#include "inspircd.h"
 
 /** Handle /SAQUIT
  */
-class cmd_saquit : public command_t
+class CommandSaquit : public Command
 {
  public:
- cmd_saquit (InspIRCd* Instance) : command_t(Instance,"SAQUIT",'o',2)
+       CommandSaquit(Module* Creator) : Command(Creator, "SAQUIT", 2, 2)
        {
-               this->source = "m_saquit.so";
-               syntax = "<nick> <reason>";
+               flags_needed = 'o'; syntax = "<nick> :<reason>";
+               TRANSLATE2(TR_NICK, TR_TEXT);
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
-               userrec* dest = ServerInstance->FindNick(parameters[0]);
-               if (dest)
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               if ((dest) && (dest->registered == REG_ALL))
                {
-                       if (ServerInstance->ULine(dest->server))
+                       if (dest->server->IsULine())
                        {
-                               user->WriteServ("990 %s :Cannot use an SA command on a u-lined client",user->nick);
+                               user->WriteNumeric(ERR_NOPRIVILEGES, "Cannot use an SA command on a U-lined client");
                                return CMD_FAILURE;
                        }
-                       irc::stringjoiner reason_join(" ", parameters, 1, pcnt - 1);
-                       std::string line = reason_join.GetJoined();
 
-                       ServerInstance->WriteOpers("*** "+std::string(user->nick)+" used SAQUIT to make "+std::string(dest->nick)+" quit with a reason of "+line);
-                       userrec::QuitUser(ServerInstance, dest, line);
+                       // Pass the command on, so the client's server can quit it properly.
+                       if (!IS_LOCAL(dest))
+                               return CMD_SUCCESS;
 
+                       ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAQUIT to make "+dest->nick+" quit with a reason of "+parameters[1]);
+
+                       ServerInstance->Users->QuitUser(dest, parameters[1]);
                        return CMD_SUCCESS;
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Invalid nickname '%s'", user->nick, parameters[0]);
+                       user->WriteNotice("*** Invalid nickname: '" + parameters[0] + "'");
+                       return CMD_FAILURE;
                }
-
-               return CMD_FAILURE;
        }
-};
 
-class ModuleSaquit : public Module
-{
-       cmd_saquit*     mycommand;
- public:
-       ModuleSaquit(InspIRCd* Me)
-               : Module(Me)
-       {
-               
-               mycommand = new cmd_saquit(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-       }
-       
-       virtual ~ModuleSaquit()
+       RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE
        {
+               return ROUTE_OPT_UCAST(parameters[0]);
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-       }
-       
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleSaquitFactory : public ModuleFactory
+class ModuleSaquit : public Module
 {
+       CommandSaquit cmd;
  public:
-       ModuleSaquitFactory()
-       {
-       }
-       
-       ~ModuleSaquitFactory()
+       ModuleSaquit()
+               : cmd(this)
        {
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return new ModuleSaquit(Me);
+               return Version("Provides the SAQUIT command, allows opers to force-quit users", VF_OPTCOMMON | VF_VENDOR);
        }
-       
 };
 
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleSaquitFactory;
-}
-
+MODULE_INIT(ModuleSaquit)