X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sapart.cpp;h=1713e07c0cba3fa041314283e8e48a8d634689ee;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=b0f0f9d1cd49aaf793c14a05385b6472fa6050c3;hpb=241a1e075cd923c259600e134c3359bdc4a1c7ee;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index b0f0f9d1c..9fb6b3de5 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -1,133 +1,103 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * 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 + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2004-2007 Craig Edwards * - * --------------------------------------------------- + * 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 . */ -using namespace std; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAPART command */ - /** Handle /SAPART */ -class cmd_sapart : public command_t +class CommandSapart : public Command { public: - cmd_sapart (InspIRCd* Instance) : command_t(Instance,"SAPART", 'o', 2) + CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3) { - this->source = "m_sapart.so"; - syntax = " "; + flags_needed = 'o'; syntax = " [,]+ [:]"; + TRANSLATE3(TR_NICK, TR_TEXT, 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]); - chanrec* channel = ServerInstance->FindChan(parameters[1]); - if (dest && channel) + if (CommandParser::LoopCall(user, this, parameters, 1)) + return CMD_FAILURE; + + User* dest = ServerInstance->FindNick(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[1]); + std::string reason; + + if ((dest) && (dest->registered == REG_ALL) && (channel)) { - if (ServerInstance->ULine(dest->server)) + if (parameters.size() > 2) + reason = parameters[2]; + + 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; } - if (!channel->PartUser(dest, dest->nick)) - delete channel; - chanrec* n = ServerInstance->FindChan(parameters[1]); - if (!n) + if (!channel->HasUser(dest)) { - ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); - return CMD_SUCCESS; + user->WriteNotice("*** " + dest->nick + " is not on " + channel->name); + return CMD_FAILURE; } - else + + /* For local clients, directly part them generating a PART message. For remote clients, + * just return CMD_SUCCESS knowing the protocol module will route the SAPART to the users + * local server and that will generate the PART instead + */ + if (IS_LOCAL(dest)) { - if (!n->HasUser(dest)) - { - ServerInstance->WriteOpers(std::string(user->nick)+" used SAPART to make "+dest->nick+" part "+parameters[1]); - return CMD_SUCCESS; - } - else - { - user->WriteServ("NOTICE %s :*** Unable to make %s part %s",user->nick, dest->nick, parameters[1]); - return CMD_FAILURE; - } + channel->PartUser(dest, reason); + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+channel->name); } return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick); + user->WriteNotice("*** Invalid nickname or channel"); } return CMD_FAILURE; } -}; - -class ModuleSapart : public Module -{ - cmd_sapart* mycommand; - public: - ModuleSapart(InspIRCd* Me) - : Module::Module(Me) - { - - mycommand = new cmd_sapart(ServerInstance); - ServerInstance->AddCommand(mycommand); - } - - virtual ~ModuleSapart() + 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 ModuleSapartFactory : public ModuleFactory +class ModuleSapart : public Module { + CommandSapart cmd; public: - ModuleSapartFactory() + ModuleSapart() + : cmd(this) { } - - ~ModuleSapartFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleSapart(Me); + return Version("Provides the SAPART command, allows opers to force-part users from channels", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSapartFactory; -} - +MODULE_INIT(ModuleSapart)