Make end of netburst SNOMASK REMOTELINK unless servers are directly linked [jackmcbarn]

[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 6f9ddf8ededef7004282f5ec394ab705c71b2007..df3db0e12ae280714294602ee4c697969ee0e163 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -18,9 +18,9 @@
 class NoCTCP : public ModeHandler
 {
  public:
-       NoCTCP(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoCTCP(InspIRCd* Instance, 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)
                {
@@ -69,35 +69,35 @@ class ModuleNoCTCP : public Module
                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)
+       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(ServerInstance, 'C') && c->GetPrefixValue(user) == OP_VALUE)
                        {
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
 
-                       if (c->IsModeSet('C') || c->GetExtBanStatus(user, 'C') < 0)
+                       if (!c->GetExtBanStatus(user, 'C').check(!c->IsModeSet('C')))
                        {
                                if ((text.length()) && (text[0] == '\1'))
                                {
                                        if (strncmp(text.c_str(),"\1ACTION ",8))
                                        {
                                                user->WriteNumeric(ERR_NOCTCPALLOWED, "%s %s :Can't send CTCP to channel (+C set)",user->nick.c_str(), c->name.c_str());
-                                               return 1;
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void On005Numeric(std::string &output)