Fix IPv6 cloaking in compatability mode (was using the wrong xtab confusor)

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

diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index 0181cb2fe9f0b6997252c3f1bf5b5ed95eba6a2e..4cf18264c862da780962de79b9381f7020545a4e 100644 (file)
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -23,8 +23,8 @@ class CBan : public XLine
 public:
        irc::string matchtext;
 
-       CBan(InspIRCd* Instance, time_t s_time, long d, std::string src, std::string re, std::string ch)
-               : XLine(Instance, s_time, d, src, re, "CBAN")
+       CBan(time_t s_time, long d, std::string src, std::string re, std::string ch)
+               : XLine(s_time, d, src, re, "CBAN")
        {
                this->matchtext = ch.c_str();
        }
@@ -63,13 +63,13 @@ public:
 class CBanFactory : public XLineFactory
 {
  public:
-       CBanFactory(InspIRCd* Instance) : XLineFactory(Instance, "CBAN") { }
+       CBanFactory() : XLineFactory("CBAN") { }
 
        /** Generate a shun
        */
        XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask)
        {
-               return new CBan(ServerInstance, set_time, duration, source, reason, xline_specific_mask);
+               return new CBan(set_time, duration, source, reason, xline_specific_mask);
        }
 
        bool AutoApplyToUserList(XLine *x)
@@ -116,7 +116,7 @@ class CommandCBan : public Command
 
                        try
                        {
-                               r = new CBan(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
+                               r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str());
                        }
                        catch (...)
                        {
@@ -162,7 +162,7 @@ class ModuleCBan : public Module
        CBanFactory f;
 
  public:
-       ModuleCBan(InspIRCd* Me) : Module(Me), mycommand(this), f(Me)
+       ModuleCBan() : mycommand(this)
        {
                ServerInstance->XLines->RegisterFactory(&f);
 
@@ -205,7 +205,7 @@ class ModuleCBan : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR);
        }
 };