* ---------------------------------------------------
*/
+using namespace std;
+
// Message and notice filtering using glob patterns
// a module based on the original work done by Craig Edwards in 2003
// for the chatspike network.
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
-
-
class ModuleFilter : public Module
{
Server *Srv;
ConfigReader *Conf, *MyConf;
public:
- ModuleFilter()
+ ModuleFilter(Server* Me)
+ : Module::Module(Me)
{
// read the configuration file on startup.
// it is perfectly valid to set <filter file> to the value of the
// main config file, then append your <keyword> tags to the bottom
// of the main config... but rather messy. That's why the capability
// of using a seperate config file is provided.
- Srv = new Server;
+ Srv = Me;
Conf = new ConfigReader;
std::string filterfile = Conf->ReadValue("filter","file",0);
MyConf = new ConfigReader(filterfile);
if ((filterfile == "") || (!MyConf->Verify()))
{
- printf("Error, could not find <filter file=\"\"> definition in your config file!");
+ printf("Error, could not find <filter file=\"\"> definition in your config file!\n");
log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
return;
}
virtual ~ModuleFilter()
{
- delete Srv;
delete MyConf;
delete Conf;
}
virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
{
- std::string text2 = text + " ";
+ std::string text2 = text+" ";
for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
{
std::string pattern = MyConf->ReadValue("keyword","pattern",index);
- if (Srv->MatchText(text2,pattern))
+ if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
{
std::string target = "";
std::string reason = MyConf->ReadValue("keyword","reason",index);
virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
{
- std::string text2 = text + " ";
+ std::string text2 = text+" ";
for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
{
std::string pattern = MyConf->ReadValue("keyword","pattern",index);
- if (Srv->MatchText(text2,pattern))
+ if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
{
std::string target = "";
std::string reason = MyConf->ReadValue("keyword","reason",index);
return 0;
}
- virtual void OnRehash()
+ virtual void OnRehash(std::string parameter)
{
// reload our config file on rehash - we must destroy and re-allocate the classes
// to call the constructor again and re-read our data.
{
}
- virtual Module * CreateModule()
+ virtual Module * CreateModule(Server* Me)
{
- return new ModuleFilter;
+ return new ModuleFilter(Me);
}
};