X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sapart.cpp;h=89256e0e480bfc5cc9811e69a27f4a12d66b545e;hb=e6601069038c35c546fd3f3dce95024b0d13f1b4;hp=918a8ca56e2750d636a2f4e72f1c7de514ba2578;hpb=1383dba43e463f292aea094d01f62f355946049d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sapart.cpp b/src/modules/m_sapart.cpp index 918a8ca56..89256e0e4 100644 --- a/src/modules/m_sapart.cpp +++ b/src/modules/m_sapart.cpp @@ -1,106 +1,129 @@ -/* +------------------------------------+ - * | 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" -/* $ModDesc: Provides support for unreal-style SAPART command */ +#include "inspircd.h" -Server *Srv; +/* $ModDesc: Provides command SAPART to force-part users from a channel. */ -class cmd_sapart : public command_t +/** Handle /SAPART + */ +class CommandSapart : public Command { public: - cmd_sapart () : command_t("SAPART", 'o', 2) + CommandSapart(Module* Creator) : Command(Creator,"SAPART", 2, 3) { - this->source = "m_sapart.so"; + flags_needed = 'o'; Penalty = 0; syntax = " [reason]"; + TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - - void Handle (char **parameters, int pcnt, userrec *user) + + CmdResult Handle (const std::vector& parameters, User *user) { - userrec* dest = Srv->FindNick(std::string(parameters[0])); - if (dest) + User* dest = ServerInstance->FindNick(parameters[0]); + Channel* channel = ServerInstance->FindChan(parameters[1]); + std::string reason; + + if ((dest) && (dest->registered == REG_ALL) && (channel)) { - for (unsigned int x = 0; x < strlen(parameters[1]); x++) + if (parameters.size() > 2) + reason = parameters[2]; + + if (ServerInstance->ULine(dest->server)) { - if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ',')) + user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Cannot use an SA command on a u-lined client",user->nick.c_str()); + return CMD_FAILURE; + } + + /* 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)) + { + channel->PartUser(dest, reason); + + Channel* n = ServerInstance->FindChan(parameters[1]); + if (!n) + { + ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SAPART to make "+dest->nick+" part "+parameters[1]); + return CMD_SUCCESS; + } + else + { + if (!n->HasUser(dest)) { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); - return; + ServerInstance->SNO->WriteGlobalSno('a', 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.c_str(), dest->nick.c_str(), parameters[1].c_str()); + return CMD_FAILURE; + } + } } - Srv->SendOpers(std::string(user->nick)+" used SAPART to make "+std::string(dest->nick)+" part "+parameters[1]); - Srv->PartUserFromChannel(dest,std::string(parameters[1]),std::string(dest->nick)); + return CMD_SUCCESS; } + else + { + user->WriteServ("NOTICE %s :*** Invalid nickname or channel", user->nick.c_str()); + } + + return CMD_FAILURE; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; } }; class ModuleSapart : public Module { - cmd_sapart* mycommand; + CommandSapart cmd; public: - ModuleSapart(Server* Me) - : Module::Module(Me) - { - Srv = Me; - mycommand = new cmd_sapart(); - Srv->AddCommand(mycommand); - } - - virtual ~ModuleSapart() + ModuleSapart() + : cmd(this) { } - - virtual Version GetVersion() - { - return Version(1,0,0,1,VF_VENDOR); - } - -}; - -// stuff down here is the module-factory stuff. For basic modules you can ignore this. -class ModuleSapartFactory : public ModuleFactory -{ - public: - ModuleSapartFactory() + void init() { + ServerInstance->Modules->AddService(cmd); } - - ~ModuleSapartFactory() + + virtual ~ModuleSapart() { } - - virtual Module * CreateModule(Server* Me) + + virtual Version GetVersion() { - return new ModuleSapart(Me); + return Version("Provides command SAPART to force-part users from a channel.", VF_OPTCOMMON | VF_VENDOR); } - -}; +}; -extern "C" void * init_module( void ) -{ - return new ModuleSapartFactory; -} +MODULE_INIT(ModuleSapart)