Make classbase and refcountbase uncopyable; expand comments on their indended uses

[user/henk/code/inspircd.git] / src / modules / m_filter.cpp

diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp
index 36a8c4f950d6bcd1d67cb12e6eab79aeac8c80b4..0220a3a44eedeb1e4b7d3260f5c4b67a40623db4 100644 (file)
--- a/src/modules/m_filter.cpp
+++ b/src/modules/m_filter.cpp
@@ -28,7 +28,7 @@ enum FilterFlags
        FLAG_NOTICE = 16
 };
 
-class FilterResult : public classbase
+class FilterResult
 {
  public:
        std::string freeform;
@@ -101,9 +101,10 @@ class CommandFilter : public Command
 {
        FilterBase* Base;
  public:
-       CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource)
-               : Command(Me, reinterpret_cast<Module*>(f), "FILTER", "o", 1, 5), Base(f)
+       CommandFilter(FilterBase* f)
+               : Command(reinterpret_cast<Module*>(f), "FILTER", 1, 5), Base(f)
        {
+               flags_needed = 'o';
                this->syntax = "<filter-definition> <action> <flags> [<gline-duration>] :<reason>";
        }
        CmdResult Handle(const std::vector<std::string>&, User*);
@@ -112,6 +113,11 @@ class CommandFilter : public Command
        {
                user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick.c_str(), extra_text.c_str());
        }
+
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
 };
 
 class FilterBase : public Module
@@ -121,7 +127,7 @@ class FilterBase : public Module
 protected:
        std::vector<std::string> exemptfromfilter; // List of channel names excluded from filtering.
  public:
-       FilterBase(InspIRCd* Me, const std::string &source);
+       FilterBase();
        virtual ~FilterBase();
        virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
        virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) = 0;
@@ -139,7 +145,7 @@ protected:
        virtual ModResult OnStats(char symbol, User* user, string_list &results) = 0;
        virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line);
        bool AppliesToMe(User* user, FilterResult* filter, int flags);
-       void OnLoadModule(Module* mod, const std::string& name);
+       void OnLoadModule(Module* mod);
        virtual void ReadFilters(ConfigReader &MyConf) = 0;
 };
 
@@ -236,9 +242,9 @@ bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int iflags)
        return true;
 }
 
-FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me), filtcommand(this, Me, source)
+FilterBase::FilterBase() : filtcommand(this)
 {
-       Me->Modules->UseInterface("RegularExpression");
+       ServerInstance->Modules->UseInterface("RegularExpression");
        ServerInstance->AddCommand(&filtcommand);
        Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncNetwork, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnLoadModule };
        ServerInstance->Modules->Attach(eventlist, this, 8);
@@ -304,7 +310,7 @@ ModResult FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std
                }
                if (f->action == "gline")
                {
-                       GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
+                       GLine* gl = new GLine(ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString());
                        if (ServerInstance->XLines->AddLine(gl,NULL))
                        {
                                ServerInstance->XLines->ApplyLines();
@@ -393,7 +399,7 @@ ModResult FilterBase::OnPreCommand(std::string &command, std::vector<std::string
                                if (f->action == "gline")
                                {
                                        /* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */
-                                       GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString());
+                                       GLine* gl = new GLine(ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName.c_str(), f->reason.c_str(), "*", user->GetIPString());
                                        if (ServerInstance->XLines->AddLine(gl,NULL))
                                        {
                                                ServerInstance->XLines->ApplyLines();
@@ -411,7 +417,7 @@ ModResult FilterBase::OnPreCommand(std::string &command, std::vector<std::string
 
 void FilterBase::OnRehash(User* user)
 {
-       ConfigReader MyConf(ServerInstance);
+       ConfigReader MyConf;
        std::vector<std::string>().swap(exemptfromfilter);
        for (int index = 0; index < MyConf.Enumerate("exemptfromfilter"); ++index)
        {
@@ -437,7 +443,7 @@ void FilterBase::OnRehash(User* user)
        {
                for (modulelist::iterator i = ml->begin(); i != ml->end(); ++i)
                {
-                       if (RegexNameRequest(this, *i).Send() == newrxengine)
+                       if (RegexNameRequest(this, *i).result == newrxengine)
                        {
                                ServerInstance->SNO->WriteGlobalSno('a', "Filter now using engine '%s'", RegexEngine.c_str());
                                rxengine = *i;
@@ -450,18 +456,18 @@ void FilterBase::OnRehash(User* user)
        }
 }
 
-void FilterBase::OnLoadModule(Module* mod, const std::string& name)
+void FilterBase::OnLoadModule(Module* mod)
 {
        if (ServerInstance->Modules->ModuleHasInterface(mod, "RegularExpression"))
        {
-               std::string rxname = RegexNameRequest(this, mod).Send();
+               std::string rxname = RegexNameRequest(this, mod).result;
                if (rxname == RegexEngine)
                {
                        rxengine = mod;
                        /* Force a rehash to make sure that any filters that couldnt be applied from the conf
                         * on startup or on load are applied right now.
                         */
-                       ConfigReader Config(ServerInstance);
+                       ConfigReader Config;
                        ServerInstance->SNO->WriteGlobalSno('a', "Found and activated regex module '%s' for m_filter.so.", RegexEngine.c_str());
                        ReadFilters(Config);
                }
@@ -471,7 +477,7 @@ void FilterBase::OnLoadModule(Module* mod, const std::string& name)
 
 Version FilterBase::GetVersion()
 {
-       return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
+       return Version("Text (spam) filtering", VF_VENDOR | VF_COMMON);
 }
 
 
@@ -556,8 +562,7 @@ class ModuleFilter : public FilterBase
        ImplFilter fr;
 
  public:
-       ModuleFilter(InspIRCd* Me)
-       : FilterBase(Me, "m_filter.so")
+       ModuleFilter()
        {
                OnRehash(NULL);
        }
@@ -638,7 +643,7 @@ class ModuleFilter : public FilterBase
 
        virtual void OnRehash(User* user)
        {
-               ConfigReader MyConf(ServerInstance);
+               ConfigReader MyConf;
                FilterBase::OnRehash(user);
                ReadFilters(MyConf);
        }