* | 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.
+ * InspIRCd: (C) 2002-2008 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.
*
* ---------------------------------------------------
*/
-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 <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
#include "m_filter.h"
class ModuleFilter : public FilterBase
{
-
+
filter_t filters;
public:
ModuleFilter(InspIRCd* Me)
- : FilterBase::FilterBase(Me, "m_filter.so")
+ : FilterBase(Me, "m_filter.so")
{
- OnRehash("");
+ OnRehash(NULL,"");
+
}
-
+
virtual ~ModuleFilter()
{
}
- virtual FilterResult* FilterMatch(const std::string &text)
+ virtual FilterResult* FilterMatch(User* user, const std::string &text, int iflags)
{
- std::string text2 = text+" ";
for (filter_t::iterator index = filters.begin(); index != filters.end(); index++)
{
- if ((ServerInstance->MatchText(text2,index->first)) || (ServerInstance->MatchText(text,index->first)))
+
+ /* Skip ones that dont apply to us */
+ if (!FilterBase::AppliesToMe(user, index->second, iflags))
+ continue;
+
+ if (InspIRCd::Match(text,index->first))
{
- return index->second;
+ FilterResult* fr = index->second;
+ if (index != filters.begin())
+ {
+ std::string pat = index->first;
+ filters.erase(index);
+ filters.insert(filters.begin(), std::make_pair(pat,fr));
+ }
+ return fr;
}
}
return NULL;
return false;
}
- virtual std::pair<bool, std::string> AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration)
+ 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;
- x->reason = reason;
- x->action = type;
- x->gline_time = duration;
- x->freeform = freeform;
+ FilterResult* x = new FilterResult(freeform, reason, type, duration, sflags);
filters[freeform] = x;
return std::make_pair(true, "");
}
}
- virtual void OnRehash(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);
- long gline_time = ServerInstance->Duration(MyConf->ReadValue("keyword","duration",index).c_str());
- if (do_action == "")
+ 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";
- FilterResult* x = new FilterResult;
- x->reason = reason;
- x->action = do_action;
- x->gline_time = gline_time;
- x->freeform = pattern;
+ 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+" :"+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;
}
};
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleFilterFactory : public ModuleFactory
-{
- public:
- ModuleFilterFactory()
- {
- }
-
- ~ModuleFilterFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleFilter(Me);
- }
-
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleFilterFactory;
-}
+MODULE_INIT(ModuleFilter)