Strip SUPPORT_IP6LINKS #define

[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 00eea1309665c308374487baa5783a38cf60a31e..2f2b3d01170021fd706dbe1b764f72e1a7387b1c 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -57,10 +57,20 @@ class ModuleNoCTCP : public Module
                nc = new NoCTCP(ServerInstance);
                if (!ServerInstance->Modes->AddMode(nc))
                        throw ModuleException("Could not add new modes!");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
+       virtual ~ModuleNoCTCP()
+       {
+               ServerInstance->Modes->DelMode(nc);
+               delete nc;
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+       }
 
        virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
@@ -78,13 +88,13 @@ class ModuleNoCTCP : public Module
                                return 0;
                        }
 
-                       if (c->IsModeSet('C'))
+                       if (c->IsModeSet('C') || c->GetExtBanStatus(user, 'C') < 0)
                        {
                                if ((text.length()) && (text[0] == '\1'))
                                {
                                        if (strncmp(text.c_str(),"\1ACTION ",8))
                                        {
-                                               user->WriteNumeric(492, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
+                                               user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
                                                return 1;
                                        }
                                }
@@ -93,15 +103,9 @@ class ModuleNoCTCP : public Module
                return 0;
        }
 
-       virtual ~ModuleNoCTCP()
-       {
-               ServerInstance->Modes->DelMode(nc);
-               delete nc;
-       }
-
-       virtual Version GetVersion()
+       virtual void On005Numeric(std::string &output)
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               ServerInstance->AddExtBanChar('C');
        }
 };