Remote /MAP: caution, this doesn't compile

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

diff --git a/src/modules/m_blockcolor.cpp b/src/modules/m_blockcolor.cpp
index 69b0e468699d5195b44fcfaefed33b64daef15c5..a6a255e23f093ff7e0046dda74ad0e9ce2285dfa 100644 (file)
--- a/src/modules/m_blockcolor.cpp
+++ b/src/modules/m_blockcolor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,9 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +c */
 
@@ -25,7 +22,7 @@ class BlockColor : public ModeHandler
  public:
        BlockColor(InspIRCd* Instance) : ModeHandler(Instance, 'c', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -57,40 +54,40 @@ class ModuleBlockColour : public Module
        ModuleBlockColour(InspIRCd* Me) : Module(Me)
        {
                bc = new BlockColor(ServerInstance);
-               if (!ServerInstance->AddMode(bc, 'c'))
+               if (!ServerInstance->Modes->AddMode(bc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
 
 
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
-                       chanrec* c = (chanrec*)dest;
+                       Channel* c = (Channel*)dest;
+
+                       if (CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) == STATUS_OP)
+                       {
+                               return 0;
+                       }
                        
                        if(c->IsModeSet('c'))
                        {
-                               if (!CHANOPS_EXEMPT(ServerInstance, 'c') || CHANOPS_EXEMPT(ServerInstance, 'c') && c->GetStatus(user) != STATUS_OP)
+                               for (std::string::iterator i = text.begin(); i != text.end(); i++)
                                {
-                                       for (std::string::iterator i = text.begin(); i != text.end(); i++)
+                                       switch (*i)
                                        {
-                                               switch (*i)
-                                               {
-                                                       case 2:
-                                                       case 3:
-                                                       case 15:
-                                                       case 21:
-                                                       case 22:
-                                                       case 31:
-                                                               user->WriteServ("404 %s %s :Can't send colours to channel (+c set)",user->nick, c->name);
-                                                               return 1;
-                                                       break;
-                                               }
+                                               case 2:
+                                               case 3:
+                                               case 15:
+                                               case 21:
+                                               case 22:
+                                               case 31:
+                                                       user->WriteNumeric(404, "%s %s :Can't send colours to channel (+c set)",user->nick, c->name);
+                                                       return 1;
+                                               break;
                                        }
                                }
                        }
@@ -98,7 +95,7 @@ class ModuleBlockColour : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
@@ -106,12 +103,12 @@ class ModuleBlockColour : public Module
        virtual ~ModuleBlockColour()
        {
                ServerInstance->Modes->DelMode(bc);
-               DELETE(bc);
+               delete bc;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };