* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * 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 <sstream>
-#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 */
}
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder)
+ CmdResult Handle (const std::vector<std::string>& parameters, 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;
* /remove <nick> <channel> [reason ...]
* /fpart <channel> <nick> [reason ...]
*/
- channame = parameters[ neworder ? 0 : 1];
- username = parameters[ neworder ? 1 : 0];
+ channame = parameters[ neworder ? 0 : 1].c_str();
+ username = parameters[ neworder ? 1 : 0].c_str();
/* Look up the user we're meant to be removing from the channel */
target = ServerInstance->FindNick(username);
/* Fix by brain - someone needs to learn to validate their input! */
if (!target || !channel)
{
- user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame);
+ user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, !target ? username : channame);
return CMD_FAILURE;
}
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)))
std::string reasonparam("No reason given");
/* If a reason is given, use it */
- if(pcnt > 2)
+ if(parameters.size() > 2)
{
/* Join params 2 ... pcnt - 1 (inclusive) into one */
- irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1);
+ irc::stringjoiner reason_join(" ", parameters, 2, parameters.size() - 1);
reasonparam = reason_join.GetJoined();
}
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 = "<nick> <channel> [<reason>]";
+ TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END);
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, pcnt, user, false);
+ return RemoveBase::Handle(parameters, user, false);
}
};
/** 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 = "<channel> <nick> [<reason>]";
}
- CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
- return RemoveBase::Handle(parameters, pcnt, user, true);
+ return RemoveBase::Handle(parameters, user, true);
}
};
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);
virtual ~ModuleRemove()
{
- delete mycommand;
- delete mycommand2;
}
virtual Version GetVersion()
{
- return Version(1,1,1,0,VF_VENDOR,API_VERSION);
+ return Version(1, 2, 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)
projects / user / henk / code / inspircd.git / blobdiff