Merge pull request #215 from attilamolnar/insp20+modfixes

[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 e2bc82151ceb7b885711666fabb37892f70850b7..0b4e39764151486e9b12d9a1318cd2abd5689a66 100644 (file)
--- a/src/modules/m_noctcp.cpp
+++ b/src/modules/m_noctcp.cpp
@@ -1,16 +1,24 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +C */
@@ -18,9 +26,9 @@
 class NoCTCP : public ModeHandler
 {
  public:
-       NoCTCP(InspIRCd* Instance) : ModeHandler(Instance, 'C', 0, 0, false, MODETYPE_CHANNEL, false) { }
+       NoCTCP(Module* Creator) : ModeHandler(Creator, "noctcp", '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)
                {
@@ -46,62 +54,61 @@ 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()
+       {
+       }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual Version GetVersion()
+       {
+               return Version("Provides support for unreal-style channel mode +C", VF_VENDOR);
+       }
+
+       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;
+                       ModResult res = ServerInstance->OnCheckExemption(user,c,"noctcp");
 
-                       if (CHANOPS_EXEMPT(ServerInstance, 'C') && c->GetStatus(user) == STATUS_OP)
-                       {
-                               return 0;
-                       }
+                       if (res == MOD_RES_ALLOW)
+                               return MOD_RES_PASSTHRU;
 
-                       if (c->IsModeSet('C') || c->IsExtBanned(user, '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(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;
-       }
-
-       virtual ~ModuleNoCTCP()
-       {
-               ServerInstance->Modes->DelMode(nc);
-               delete nc;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual Version GetVersion()
+       virtual void On005Numeric(std::string &output)
        {
-               return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               ServerInstance->AddExtBanChar('C');
        }
 };