+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * 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 <string>
#include "users.h"
#include "channels.h"
#include "modules.h"
-#include "helperfuncs.h"
#include "configreader.h"
#include "inspircd.h"
* eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes.
*/
-extern InspIRCd* ServerInstance;
-
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)
{
}
}
}
- 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;
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.
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", channel->GetStatusChar(user));
- ulevel = chartolevel(channel->GetStatusChar(user));
+ 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", channel->GetStatusChar(target));
- tlevel = chartolevel(channel->GetStatusChar(target));
+ ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target));
+ tlevel = chartolevel(channel->GetPrefixChar(target));
}
hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q'));
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;
}
};
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 = "<nick> <channel> [<reason>]";
}
- 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);
}
};
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 = "<channel> <nick> [<reason>]";
}
- 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
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("");
}
virtual void OnRehash(const std::string&)
{
- ConfigReader conf;
-
+ ConfigReader conf(ServerInstance);
supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0);
}
{
}
- virtual Module * CreateModule(Server* Me)
+ virtual Module * CreateModule(InspIRCd* Me)
{
return new ModuleRemove(Me);
}
projects / user / henk / code / inspircd.git / blobdiff