X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_remove.cpp;h=868599948160ffb8a26406d97c6ef8b2c87b195f;hb=83137d5f9274832f152acc7d19de3cb0897f9630;hp=47d16f14c9a8883fad148d75e7099c03c3c94ca1;hpb=07b50fd21f4b3bbf2b7cd598069afeafb526db9a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 47d16f14c..868599948 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -2,26 +2,15 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -/* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */ -/* Written by Om, 25-03-05 */ - -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" #include "inspircd.h" /* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */ @@ -80,12 +69,12 @@ class RemoveBase } } - CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder) + CmdResult Handle (const char* const* parameters, int pcnt, User *user, bool neworder) { const char* channame; const char* username; - userrec* target; - chanrec* channel; + User* target; + Channel* channel; ModeLevel tlevel; ModeLevel ulevel; std::string reason; @@ -127,48 +116,40 @@ class RemoveBase if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick)) { - ServerInstance->Log(DEBUG, "Setting ulevel to U"); ulevel = chartolevel("U"); } if (user->GetExt(founderkey)) { - ServerInstance->Log(DEBUG, "Setting ulevel to ~"); ulevel = chartolevel("~"); } else if (user->GetExt(protectkey)) { - ServerInstance->Log(DEBUG, "Setting ulevel to &"); ulevel = chartolevel("&"); } else { - ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetPrefixChar(user)); ulevel = chartolevel(channel->GetPrefixChar(user)); } /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */ if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick)) { - ServerInstance->Log(DEBUG, "Setting tlevel to U"); tlevel = chartolevel("U"); } else if (target->GetExt(founderkey)) { - ServerInstance->Log(DEBUG, "Setting tlevel to ~"); tlevel = chartolevel("~"); } else if (target->GetExt(protectkey)) { - ServerInstance->Log(DEBUG, "Setting tlevel to &"); tlevel = chartolevel("&"); } else { - ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target)); tlevel = chartolevel(channel->GetPrefixChar(target)); } - hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q')); + hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q')); /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */ if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks || (ulevel == ULINE))) @@ -215,22 +196,24 @@ class RemoveBase return CMD_FAILURE; } + /* route me */ return CMD_SUCCESS; } }; /** Handle /REMOVE */ -class cmd_remove : public command_t, public RemoveBase +class CommandRemove : public Command, public RemoveBase { public: - cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) + CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = " []"; + TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char* const* parameters, int pcnt, User *user) { return RemoveBase::Handle(parameters, pcnt, user, false); } @@ -238,16 +221,16 @@ class cmd_remove : public command_t, public RemoveBase /** Handle /FPART */ -class cmd_fpart : public command_t, public RemoveBase +class CommandFpart : public Command, public RemoveBase { public: - cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) + CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = " []"; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char* const* parameters, int pcnt, User *user) { return RemoveBase::Handle(parameters, pcnt, user, true); } @@ -255,33 +238,31 @@ class cmd_fpart : public command_t, public RemoveBase class ModuleRemove : public Module { - cmd_remove* mycommand; - cmd_fpart* mycommand2; + CommandRemove* mycommand; + CommandFpart* mycommand2; bool supportnokicks; public: ModuleRemove(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { - mycommand = new cmd_remove(ServerInstance, supportnokicks); - mycommand2 = new cmd_fpart(ServerInstance, supportnokicks); + mycommand = new CommandRemove(ServerInstance, supportnokicks); + mycommand2 = new CommandFpart(ServerInstance, supportnokicks); ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand2); - OnRehash(""); + OnRehash(NULL,""); + Implementation eventlist[] = { I_On005Numeric, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - void Implements(char* List) - { - List[I_On005Numeric] = List[I_OnRehash] = 1; - } virtual void On005Numeric(std::string &output) { output.append(" REMOVE"); } - virtual void OnRehash(const std::string&) + virtual void OnRehash(User* user, const std::string&) { ConfigReader conf(ServerInstance); supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); @@ -289,39 +270,13 @@ class ModuleRemove : public Module virtual ~ModuleRemove() { - delete mycommand; - delete mycommand2; } virtual Version GetVersion() { - return Version(1,1,1,0,VF_VENDOR,API_VERSION); + return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleRemoveFactory : public ModuleFactory -{ - public: - ModuleRemoveFactory() - { - } - - ~ModuleRemoveFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleRemove(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} +MODULE_INIT(ModuleRemove)