bool Matches(User *u)
{
- if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(u->GetFullRealHost(), matchtext))
+ if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext))
return true;
return false;
{
cmd_shun* mycommand;
ShunFactory *f;
+ std::map<std::string, bool> ShunEnabledCommands;
+ bool NotifyOfShun;
public:
ModuleShun(InspIRCd* Me) : Module(Me)
mycommand = new cmd_shun(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[thiscmd] = true;
+ }
+
+ NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0);
+ }
+
virtual void OnUserConnect(User* user)
{
if (!IS_LOCAL(user))
return 0;
}
+ std::map<std::string, bool>::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);
}
};