+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2009 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 "inspircd.h"
#include "xline.h"
//typedef std::vector<Shun> shunlist;
-class cmd_shun : public Command
+class CommandShun : public Command
{
private:
InspIRCd *Srv;
public:
- cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me)
+ CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me)
{
this->source = "m_shun.so";
+ this->syntax = "<nick!user@hostmask> [<shun-duration>] :<reason>";
}
CmdResult Handle(const std::vector<std::string>& parameters, User *user)
{
if (!duration)
{
- ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str());
+ ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str());
}
else
{
time_t c_requires_crap = duration + ServerInstance->Time();
- ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick.c_str(), parameters[0].c_str(),
- ServerInstance->TimeString(c_requires_crap).c_str());
+ ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str());
}
ServerInstance->XLines->ApplyLines();
class ModuleShun : public Module
{
- cmd_shun* mycommand;
+ CommandShun* mycommand;
ShunFactory *f;
+ std::set<std::string> ShunEnabledCommands;
+ bool NotifyOfShun;
public:
ModuleShun(InspIRCd* Me) : Module(Me)
f = new ShunFactory(ServerInstance);
ServerInstance->XLines->RegisterFactory(f);
- mycommand = new cmd_shun(ServerInstance);
+ mycommand = new CommandShun(ServerInstance);
ServerInstance->AddCommand(mycommand);
- Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash };
+ ServerInstance->Modules->Attach(eventlist, this, 4);
+ OnRehash(NULL, "");
}
virtual ~ModuleShun()
return 1;
}
+ virtual void OnRehash(User* user, const std::string ¶meter)
+ {
+ ConfigReader MyConf(ServerInstance);
+ std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0);
+
+ if (cmds.empty())
+ cmds = "PING PONG QUIT";
+
+ ShunEnabledCommands.clear();
+ NotifyOfShun = true;
+
+ std::stringstream dcmds(cmds);
+ std::string thiscmd;
+
+ while (dcmds >> thiscmd)
+ {
+ ShunEnabledCommands.insert(thiscmd);
+ }
+
+ NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+ }
+
virtual void OnUserConnect(User* user)
{
if (!IS_LOCAL(user))
return 0;
}
+ std::set<std::string>::iterator i = ShunEnabledCommands.find(command);
+
+ if (i == ShunEnabledCommands.end())
+ {
+ user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str());
+ return 1;
+ }
+
if (command == "QUIT")
{
/* Allow QUIT but dont show any quit message */
parameters.clear();
- return 0;
}
-
- /* Always allow PONG and PING */
- if (command == "PONG" || command == "PING")
- return 0;
+ else if (command == "PART")
+ {
+ /* same for PART */
+ parameters.clear();
+ }
return 1;
}
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION);
+ return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION);
}
};