* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
*/
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "m_filter.h"
/* $ModDesc: An advanced spam filtering module */
class ModuleFilter : public FilterBase
{
-
+
filter_t filters;
public:
: FilterBase(Me, "m_filter.so")
{
OnRehash(NULL,"");
+
}
-
+
virtual ~ModuleFilter()
{
}
- virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags)
+ virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
{
for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
{
/* Skip ones that dont apply to us */
- if (!FilterBase::AppliesToMe(user, index->second, flags))
+ if (!FilterBase::AppliesToMe(user, index->second, iflags))
continue;
- if (ServerInstance->MatchText(text,index->first))
+ if (InspIRCd::Match(text,index->first))
{
FilterResult* fr = index->second;
if (index != filters.begin())
return false;
}
- virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags)
+ virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &sflags)
{
if (filters.find(freeform) != filters.end())
{
return std::make_pair(false, "Filter already exists");
}
- FilterResult* x = new FilterResult(freeform, reason, type, duration, flags);
+ FilterResult* x = new FilterResult(freeform, reason, type, duration, sflags);
filters[freeform] = x;
return std::make_pair(true, "");
}
}
- virtual void OnRehash(userrec* user, const std::string ¶meter)
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ConfigReader* MyConf = new ConfigReader(ServerInstance);
std::string pattern = MyConf->ReadValue("keyword","pattern",index);
std::string reason = MyConf->ReadValue("keyword","reason",index);
std::string do_action = MyConf->ReadValue("keyword","action",index);
- std::string flags = MyConf->ReadValue("keyword","flags",index);
+ std::string sflags = MyConf->ReadValue("keyword","flags",index);
long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index));
if (do_action.empty())
do_action = "none";
- if (flags.empty())
- flags = "*";
- FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, flags);
+ if (sflags.empty())
+ sflags = "*";
+ FilterResult* x = new FilterResult(pattern, reason, do_action, gline_time, sflags);
filters[pattern] = x;
}
- DELETE(MyConf);
+ delete MyConf;
+ FilterBase::OnRehash(user, parameter);
}
- virtual int OnStats(char symbol, userrec* user, string_list &results)
+ virtual int OnStats(char symbol, User* user, string_list &results)
{
if (symbol == 's')
{
std::string sn = ServerInstance->Config->ServerName;
for (filter_t::iterator n = filters.begin(); n != filters.end(); n++)
{
- results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
+ results.push_back(sn+" 223 "+user->nick+" :GLOB:"+n->second->freeform+" "+n->second->flags+" "+n->second->action+" "+ConvToStr(n->second->gline_time)+" :"+n->second->reason);
}
}
return 0;
};
-MODULE_INIT(ModuleFilter);
+MODULE_INIT(ModuleFilter)