X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=e7aa9f7a978b88b44e5317ca303a0daa0bef31a6;hb=6bc3d71946b339a5a10ca621b029fe8a5b180d68;hp=bab5ea11b77e1777b56a5dd7b61abb6565434c7e;hpb=6f1b8f50dd8a9f73c9e02e64253e7e45642a88d0;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index bab5ea11b..e7aa9f7a9 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,12 +1,22 @@ -/* 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 */ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ #include -#include #include "users.h" #include "channels.h" #include "modules.h" -#include "helperfuncs.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 */ @@ -16,22 +26,24 @@ * eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes. */ +/** Base class for /FPART and /REMOVE + */ class RemoveBase { private: - Server* Srv; bool& supportnokicks; + InspIRCd* ServerInstance; protected: - RemoveBase(Server* Me, bool& snk) - : Srv(Me), supportnokicks(snk) + RemoveBase(InspIRCd* Instance, bool& snk) : supportnokicks(snk), ServerInstance(Instance) { } 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()) @@ -62,7 +74,7 @@ class RemoveBase } } - void Handle (const char** parameters, int pcnt, userrec *user, bool neworder) + CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder) { const char* channame; const char* username; @@ -70,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; @@ -84,22 +96,22 @@ class RemoveBase username = parameters[ neworder ? 1 : 0]; /* Look up the user we're meant to be removing from the channel */ - target = Srv->FindNick(username); + target = ServerInstance->FindNick(username); /* And the channel we're meant to be removing them from */ - channel = Srv->FindChannel(channame); + channel = ServerInstance->FindChan(channame); /* Fix by brain - someone needs to learn to validate their input! */ if (!target || !channel) { - WriteServ(user->fd,"401 %s %s :No such nick/channel", user->nick, !target ? username : channame); - return; + user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame); + return CMD_FAILURE; } if (!channel->HasUser(target)) { - WriteServ(user->fd, "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); - return; + user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); + return CMD_FAILURE; } /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set. @@ -107,128 +119,132 @@ class RemoveBase protectkey = "cm_protect_" + std::string(channel->name); founderkey = "cm_founder_" + std::string(channel->name); - if (Srv->IsUlined(user->server) || Srv->IsUlined(user->nick)) + if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick)) { - log(DEBUG, "Setting ulevel to U"); + ServerInstance->Log(DEBUG, "Setting ulevel to U"); ulevel = chartolevel("U"); } if (user->GetExt(founderkey)) { - log(DEBUG, "Setting ulevel to ~"); + ServerInstance->Log(DEBUG, "Setting ulevel to ~"); ulevel = chartolevel("~"); } else if (user->GetExt(protectkey)) { - log(DEBUG, "Setting ulevel to &"); + ServerInstance->Log(DEBUG, "Setting ulevel to &"); ulevel = chartolevel("&"); } else { - log(DEBUG, "Setting ulevel to %s", Srv->ChanMode(user, channel).c_str()); - ulevel = chartolevel(Srv->ChanMode(user, channel)); + 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 (Srv->IsUlined(target->server) || Srv->IsUlined(target->nick)) + if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick)) { - log(DEBUG, "Setting tlevel to U"); + ServerInstance->Log(DEBUG, "Setting tlevel to U"); tlevel = chartolevel("U"); } else if (target->GetExt(founderkey)) { - log(DEBUG, "Setting tlevel to ~"); + ServerInstance->Log(DEBUG, "Setting tlevel to ~"); tlevel = chartolevel("~"); } else if (target->GetExt(protectkey)) { - log(DEBUG, "Setting tlevel to &"); + ServerInstance->Log(DEBUG, "Setting tlevel to &"); tlevel = chartolevel("&"); } else { - log(DEBUG, "Setting tlevel to %s", Srv->ChanMode(target, channel).c_str()); - tlevel = chartolevel(Srv->ChanMode(target, channel)); + ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target)); + tlevel = chartolevel(channel->GetPrefixChar(target)); } - hasnokicks = (Srv->FindModule("m_nokicks.so") && channel->IsModeSet('Q')); + 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; - WriteChannelWithServ(Srv->GetServerName().c_str(), channel, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick); - WriteServ(target->fd, "NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str()); + 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 { - WriteServ(user->fd, "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name); + user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name); + return CMD_FAILURE; } } else { /* m_nokicks.so was loaded and +Q was set, block! */ - WriteServ(user->fd, "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick); + user->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick); + return CMD_FAILURE; } + + return CMD_SUCCESS; } }; +/** Handle /REMOVE + */ class cmd_remove : public command_t, public RemoveBase { public: - cmd_remove(Server* Srv, bool& snk) : command_t("REMOVE", 0, 2), RemoveBase(Srv, snk) + cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = " []"; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - RemoveBase::Handle(parameters, pcnt, user, false); + return RemoveBase::Handle(parameters, pcnt, user, false); } }; +/** Handle /FPART + */ class cmd_fpart : public command_t, public RemoveBase { public: - cmd_fpart(Server* Srv, bool snk) : command_t("FPART", 0, 2), RemoveBase(Srv, snk) + cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) { this->source = "m_remove.so"; syntax = " []"; } - void Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const char** parameters, int pcnt, userrec *user) { - RemoveBase::Handle(parameters, pcnt, user, true); - } + return RemoveBase::Handle(parameters, pcnt, user, true); + } }; class ModuleRemove : public Module @@ -237,14 +253,15 @@ class ModuleRemove : public Module cmd_fpart* mycommand2; bool supportnokicks; + public: - ModuleRemove(Server* Me) + ModuleRemove(InspIRCd* Me) : Module::Module(Me) { - mycommand = new cmd_remove(Me, supportnokicks); - mycommand2 = new cmd_fpart(Me, supportnokicks); - Me->AddCommand(mycommand); - Me->AddCommand(mycommand2); + mycommand = new cmd_remove(ServerInstance, supportnokicks); + mycommand2 = new cmd_fpart(ServerInstance, supportnokicks); + ServerInstance->AddCommand(mycommand); + ServerInstance->AddCommand(mycommand2); OnRehash(""); } @@ -260,8 +277,7 @@ class ModuleRemove : public Module virtual void OnRehash(const std::string&) { - ConfigReader conf; - + ConfigReader conf(ServerInstance); supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); } @@ -273,7 +289,7 @@ class ModuleRemove : public Module virtual Version GetVersion() { - return Version(1,0,1,0,VF_VENDOR); + return Version(1,1,1,0,VF_VENDOR,API_VERSION); } }; @@ -291,7 +307,7 @@ class ModuleRemoveFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { return new ModuleRemove(Me); }