* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
/** Base class for /FPART and /REMOVE
*/
-class RemoveBase
+class RemoveBase : public Command
{
private:
bool& supportnokicks;
- InspIRCd* ServerInstance;
- protected:
- 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 - We should probably use the new mode prefix rank stuff
- * for this instead now -- Brain */
- ModeLevel chartolevel(const std::string &privs)
+ public:
+ RemoveBase(Module* Creator, bool& snk, const char* cmdn)
+ : Command(Creator, cmdn, 2, 3), supportnokicks(snk)
{
- if(privs.empty())
- {
- return PEON;
- }
-
- switch (privs[0])
- {
- case 'U':
- /* Ulined */
- return ULINE;
- case '~':
- /* Owner */
- return OWNER;
- case '&':
- /* Admin */
- return ADMIN;
- case '@':
- /* Operator */
- return OP;
- case '%':
- /* Halfop */
- return HALFOP;
- default:
- /* Peon */
- return PEON;
- }
}
- CmdResult Handle (const std::vector<std::string>& parameters, User *user, bool neworder)
+ CmdResult HandleRMB(const std::vector<std::string>& parameters, User *user, bool neworder)
{
const char* channame;
const char* username;
User* target;
Channel* channel;
- ModeLevel tlevel;
- ModeLevel ulevel;
std::string reason;
std::string protectkey;
std::string founderkey;
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
{
- user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame);
+ user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !target ? username : channame);
return CMD_FAILURE;
}
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.
- * Then we change the @|%|+ to & if they are +a, or ~ if they are +q */
- protectkey = "cm_protect_" + std::string(channel->name);
- founderkey = "cm_founder_" + std::string(channel->name);
-
- if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick.c_str()))
- {
- ulevel = chartolevel("U");
- }
- if (user->GetExt(founderkey))
- {
- ulevel = chartolevel("~");
- }
- else if (user->GetExt(protectkey))
- {
- ulevel = chartolevel("&");
- }
- else
- {
- 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.c_str()))
- {
- tlevel = chartolevel("U");
- }
- else if (target->GetExt(founderkey))
- {
- tlevel = chartolevel("~");
- }
- else if (target->GetExt(protectkey))
- {
- tlevel = chartolevel("&");
- }
- else
- {
- tlevel = chartolevel(channel->GetPrefixChar(target));
- }
+ int ulevel = channel->GetPrefixValue(user);
+ int tlevel = channel->GetPrefixValue(target);
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)))
+ if ((!IS_LOCAL(user)) || (!supportnokicks || !hasnokicks))
{
/* 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 ((!IS_LOCAL(user)) || ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER)))
+ if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000)))
{
// no you can't just go from a std::ostringstream to a std::string, Om. -nenolod
// but you can do this, nenolod -brain
/* Build up the part reason string. */
reason = std::string("Removed by ") + user->nick + ": " + reasonparam;
- channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
+ channel->WriteChannelWithServ(ServerInstance->Config->ServerName.c_str(), "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str());
target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str());
- if (!channel->PartUser(target, reason.c_str()))
- delete channel;
+ channel->PartUser(target, reason);
}
else
{
return CMD_FAILURE;
}
- /* route me */
return CMD_SUCCESS;
}
+ virtual RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) = 0;
};
/** Handle /REMOVE
*/
-class CommandRemove : public Command, public RemoveBase
+class CommandRemove : public RemoveBase
{
public:
- CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk)
+ CommandRemove(Module* Creator, bool& snk)
+ : RemoveBase(Creator, snk, "REMOVE")
{
- this->source = "m_remove.so";
syntax = "<nick> <channel> [<reason>]";
TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, user, false);
+ return HandleRMB(parameters, user, false);
+ }
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ User* dest = ServerInstance->FindNick(parameters[0]);
+ if (dest)
+ return ROUTE_OPT_UCAST(dest->server);
+ return ROUTE_LOCALONLY;
}
};
/** Handle /FPART
*/
-class CommandFpart : public Command, public RemoveBase
+class CommandFpart : public RemoveBase
{
public:
- CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk)
+ CommandFpart(Module* Creator, bool& snk)
+ : RemoveBase(Creator, snk, "FPART")
{
- this->source = "m_remove.so";
syntax = "<channel> <nick> [<reason>]";
+ TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END);
}
CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, user, true);
+ return HandleRMB(parameters, user, true);
+ }
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ User* dest = ServerInstance->FindNick(parameters[1]);
+ if (dest)
+ return ROUTE_OPT_UCAST(dest->server);
+ return ROUTE_LOCALONLY;
}
};
class ModuleRemove : public Module
{
- CommandRemove* mycommand;
- CommandFpart* mycommand2;
+ CommandRemove cmd1;
+ CommandFpart cmd2;
bool supportnokicks;
public:
- ModuleRemove(InspIRCd* Me)
- : Module(Me)
+ ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks)
{
- mycommand = new CommandRemove(ServerInstance, supportnokicks);
- mycommand2 = new CommandFpart(ServerInstance, supportnokicks);
- ServerInstance->AddCommand(mycommand);
- ServerInstance->AddCommand(mycommand2);
- OnRehash(NULL,"");
+ ServerInstance->AddCommand(&cmd1);
+ ServerInstance->AddCommand(&cmd2);
+ OnRehash(NULL);
Implementation eventlist[] = { I_On005Numeric, I_OnRehash };
ServerInstance->Modules->Attach(eventlist, this, 2);
}
output.append(" REMOVE");
}
- virtual void OnRehash(User* user, const std::string&)
+ virtual void OnRehash(User* user)
{
- ConfigReader conf(ServerInstance);
+ ConfigReader conf;
supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
}
virtual Version GetVersion()
{
- return Version(1, 2, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+ return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff