Added a parameter to OnRehash for the rehash parameter

[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 bf7cb8d627b41f908a0c937292c5dc4696377565..72fb4858c261323a859a4262f278f5a683adde15 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,8 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+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 */
 
@@ -17,8 +35,27 @@ class ModuleNoCTCP : public Module
                Srv = new Server;
                Srv->AddExtendedMode('C',MT_CHANNEL,false,0,0);
        }
+
+        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);
+        }
        
-       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)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -27,15 +64,18 @@ class ModuleNoCTCP : public Module
                        {
                                if ((text.length()) && (text[0] == '\1'))
                                {
-                                       WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-                                       return 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;
        }
        
-       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)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -44,14 +84,31 @@ class ModuleNoCTCP : public Module
                        {
                                if ((text.length()) && (text[0] == '\1'))
                                {
-                                       WriteServ(user->fd,"492 %s %s :Can't send CTCP to channel (+C set)",user->nick, c->name);
-                                       return 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;
        }
        
+       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
+       {
+               // check if this is our mode character...
+               if ((modechar == 'C') && (type == MT_CHANNEL))
+               {
+                       log(DEBUG,"Allowing C change");
+                       return 1;
+               }
+               else
+               {
+                       return 0;
+               }
+       }
+
        virtual ~ModuleNoCTCP()
        {
                delete Srv;
@@ -59,7 +116,7 @@ class ModuleNoCTCP : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };