X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=fcd6ae9586147aeb117cdb2eb86b19638db27b9e;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=fd85ba280036a2e237832a75e8fa31750e405b56;hpb=4b0f6c610f755e0cb93843d5a2a6c70336eafe39;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index fd85ba280..fcd6ae958 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -2,27 +2,21 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 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 "inspircd.h" #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 */ @@ -48,7 +42,8 @@ class RemoveBase enum ModeLevel { PEON = 0, HALFOP = 1, OP = 2, ADMIN = 3, OWNER = 4, ULINE = 5 }; /* This little function just converts a chanmode character (U ~ & @ & +) into an integer (5 4 3 2 1 0) */ - /* XXX - this could be handy in the core, so it can be used elsewhere */ + /* XXX - We should probably use the new mode prefix rank stuff + * for this instead now -- Brain */ ModeLevel chartolevel(const std::string &privs) { if(privs.empty()) @@ -87,7 +82,7 @@ class RemoveBase chanrec* channel; ModeLevel tlevel; ModeLevel ulevel; - std::ostringstream reason; + std::string reason; std::string protectkey; std::string founderkey; bool hasnokicks; @@ -126,83 +121,71 @@ 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')); /* 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(!supportnokicks || !hasnokicks || (ulevel == ULINE)) + if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks || (ulevel == ULINE))) { /* We'll let everyone remove their level and below, eg: * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe. * Nobody may remove a founder. */ - if ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER)) + if ((!IS_LOCAL(user)) || ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER))) { - std::string reasonparam; + // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod + // but you can do this, nenolod -brain + + std::string reasonparam("No reason given"); /* If a reason is given, use it */ if(pcnt > 2) { - reason << ":"; - - /* Use all the remaining parameters as the reason */ - for(int i = 2; i < pcnt; i++) - { - reason << " " << parameters[i]; - } - - reasonparam = reason.str(); - reason.clear(); + /* Join params 2 ... pcnt - 1 (inclusive) into one */ + irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1); + reasonparam = reason_join.GetJoined(); } /* Build up the part reason string. */ - reason << "Removed by " << user->nick << reasonparam; + reason = std::string("Removed by ") + user->nick + ": " + reasonparam; channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick); target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str()); - if (!channel->PartUser(target, reason.str().c_str())) + if (!channel->PartUser(target, reason.c_str())) delete channel; } else @@ -218,6 +201,7 @@ class RemoveBase return CMD_FAILURE; } + /* route me */ return CMD_SUCCESS; } }; @@ -265,13 +249,13 @@ class ModuleRemove : public Module public: ModuleRemove(InspIRCd* Me) - : Module::Module(Me) + : Module(Me) { mycommand = new cmd_remove(ServerInstance, supportnokicks); mycommand2 = new cmd_fpart(ServerInstance, supportnokicks); ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand2); - OnRehash(""); + OnRehash(NULL,""); } void Implements(char* List) @@ -284,7 +268,7 @@ class ModuleRemove : public Module output.append(" REMOVE"); } - virtual void OnRehash(const std::string&) + virtual void OnRehash(userrec* user, const std::string&) { ConfigReader conf(ServerInstance); supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); @@ -292,39 +276,13 @@ class ModuleRemove : public Module virtual ~ModuleRemove() { - delete mycommand; - delete mycommand2; } virtual Version GetVersion() { - return Version(1,0,1,0,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); + return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} +MODULE_INIT(ModuleRemove)