Remove InspIRCd* parameters and fields

[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 3a9b1c9c2ac07fa62d16d41a63be6260c0748e7d..58b9b7dcb513c2645023dfcebd0c85bda72fbb5a 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.
@@ -18,9 +18,9 @@
 class NoCTCP : public ModeHandler
 {
  public:
-       NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoCTCP(Module* Creator) : ModeHandler(Creator, 'C', PARAM_NONE, MODETYPE_CHANNEL) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -45,63 +45,64 @@ class NoCTCP : public ModeHandler
 
 class ModuleNoCTCP : public Module
 {
-       
-       NoCTCP* nc;
-       
+
+       NoCTCP nc;
+
  public:
- 
-       ModuleNoCTCP(InspIRCd* Me)
-               : Module(Me)
+
+       ModuleNoCTCP()
+               : nc(this)
        {
-               
-               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 };
-               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);
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version("Provides support for unreal-style channel mode +C", VF_COMMON | VF_VENDOR, API_VERSION);
+       }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreNotice(user,dest,target_type,text,status,exempt_list);
        }
-       
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if ((target_type == TYPE_CHANNEL) && (IS_LOCAL(user)))
                {
                        Channel* c = (Channel*)dest;
-                       
-                       if (CHANOPS_EXEMPT(ServerInstance, 'C') && c->GetStatus(user) == STATUS_OP)
+
+                       if (CHANOPS_EXEMPT('C') && c->GetPrefixValue(user) == OP_VALUE)
                        {
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
-                       
-                       if (c->IsModeSet('C'))
+
+                       if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
                        {
                                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);
-                                               return 1;
+                                               user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       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');
        }
 };