X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=23fee34c3267dc82155aecfa8db84b4c81c2f053;hb=aec772bdc98bdcfe35c2fc8e74942403c9efcc4d;hp=e4b149df27f2482fa816d53281ae8c8c2c1b3349;hpb=12737ab4ad61a0d8a908c8a21594c7012e21eb3c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index e4b149df2..23fee34c3 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,14 +1,21 @@ -/* 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 "commands.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 */ @@ -19,6 +26,8 @@ * 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: @@ -33,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()) @@ -64,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; @@ -72,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; @@ -95,13 +105,13 @@ class RemoveBase if (!target || !channel) { user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame); - return; + return CMD_FAILURE; } if (!channel->HasUser(target)) { user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); - return; + 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. @@ -109,100 +119,94 @@ class RemoveBase protectkey = "cm_protect_" + std::string(channel->name); founderkey = "cm_founder_" + std::string(channel->name); - if (is_uline(user->server) || is_uline(user->nick)) + if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick)) { - log(DEBUG, "Setting ulevel to U"); ulevel = chartolevel("U"); } if (user->GetExt(founderkey)) { - log(DEBUG, "Setting ulevel to ~"); ulevel = chartolevel("~"); } else if (user->GetExt(protectkey)) { - log(DEBUG, "Setting ulevel to &"); ulevel = chartolevel("&"); } else { - log(DEBUG, "Setting ulevel to %s", channel->GetStatusChar(user)); - ulevel = chartolevel(channel->GetStatusChar(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 (is_uline(target->server) || is_uline(target->nick)) + if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick)) { - log(DEBUG, "Setting tlevel to U"); tlevel = chartolevel("U"); } else if (target->GetExt(founderkey)) { - log(DEBUG, "Setting tlevel to ~"); tlevel = chartolevel("~"); } else if (target->GetExt(protectkey)) { - log(DEBUG, "Setting tlevel to &"); tlevel = chartolevel("&"); } else { - log(DEBUG, "Setting tlevel to %s", channel->GetStatusChar(target)); - tlevel = chartolevel(channel->GetStatusChar(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 { 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! */ 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: @@ -212,12 +216,14 @@ class cmd_remove : public command_t, public RemoveBase 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: @@ -227,9 +233,9 @@ class cmd_fpart : public command_t, public RemoveBase 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); } }; @@ -248,7 +254,7 @@ class ModuleRemove : public Module mycommand2 = new cmd_fpart(ServerInstance, supportnokicks); ServerInstance->AddCommand(mycommand); ServerInstance->AddCommand(mycommand2); - OnRehash(""); + OnRehash(NULL,""); } void Implements(char* List) @@ -261,7 +267,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); @@ -275,7 +281,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); } };