Decide that it wasn't quite appropriate :(

[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 30d837c67af408c32ef9d46f7dd8a1c87a9015e0..ab0808aa23b6749b88d4ce34db179bdd325d603d 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,10 +14,13 @@
  * ---------------------------------------------------
  */
 
+using namespace std;
+
 #include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -27,52 +30,29 @@ class ModuleNoCTCP : public Module
        
  public:
  
-       ModuleNoCTCP()
+       ModuleNoCTCP(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
        }
 
+       void Implements(char* List)
+       {
+               List[I_OnExtendedMode] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+       }
+
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "C";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
+               InsertMode(output,"C",4);
         }
        
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
-               if (target_type == TYPE_CHANNEL)
-               {
-                       chanrec* c = (chanrec*)dest;
-                       if (c->IsCustomModeSet('C'))
-                       {
-                               if ((text.length()) && (text[0] == '\1'))
-                               {
-                                       if (strncmp(text.c_str(),"\1ACTION ",8))
-                                       {
-                                               WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-                                               return 1;
-                                       }
-                               }
-                       }
-               }
-               return 0;
+               return OnUserPreNotice(user,dest,target_type,text,status);
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -108,12 +88,11 @@ class ModuleNoCTCP : public Module
 
        virtual ~ModuleNoCTCP()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };
 
@@ -129,9 +108,9 @@ class ModuleNoCTCPFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleNoCTCP;
+               return new ModuleNoCTCP(Me);
        }
        
 };