Include untranslated user/channel metadata in CHECK output

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

diff --git a/src/modules/m_noctcp.cpp b/src/modules/m_noctcp.cpp
index d431a7369a95795343eb88029a2fae15a040b142..b7d9295a10c9088068a5199d899ddbc1685f4316 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -46,16 +46,14 @@ class NoCTCP : public ModeHandler
 class ModuleNoCTCP : public Module
 {
 
-       NoCTCP* nc;
+       NoCTCP nc;
 
  public:
 
        ModuleNoCTCP(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), nc(Me)
        {
-
-               nc = new NoCTCP(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(nc))
+               if (!ServerInstance->Modes->AddMode(&nc))
                        throw ModuleException("Could not add new modes!");
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 3);
@@ -63,8 +61,7 @@ class ModuleNoCTCP : public Module
 
        virtual ~ModuleNoCTCP()
        {
-               ServerInstance->Modes->DelMode(nc);
-               delete nc;
+               ServerInstance->Modes->DelMode(&nc);
        }
 
        virtual Version GetVersion()
@@ -88,7 +85,7 @@ class ModuleNoCTCP : public Module
                                return 0;
                        }
 
-                       if (c->IsModeSet('C') || c->IsExtBanned(user, 'C'))
+                       if (c->IsModeSet('C') || c->GetExtBanStatus(user, 'C') < 0)
                        {
                                if ((text.length()) && (text[0] == '\1'))
                                {