Fix merge FJOIN debug message

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

diff --git a/src/modules/m_nonotice.cpp b/src/modules/m_nonotice.cpp
index 314a7c8fe13cd504db566cb3a47fe711539f9a87..9c02408cf97cf73462e734c8d6bfc6b100ee7e8c 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,69 +15,54 @@
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
-class NoNotice : public ModeHandler
+class NoNotice : public SimpleChannelModeHandler
 {
  public:
-       NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
-
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('T'))
-                       {
-                               channel->SetMode('T',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('T'))
-                       {
-                               channel->SetMode('T',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       NoNotice(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'T') { }
 };
 
 class ModuleNoNotice : public Module
 {
-       
+
        NoNotice* nt;
  public:
- 
+
        ModuleNoNotice(InspIRCd* Me)
                : Module(Me)
        {
-               
+
                nt = new NoNotice(ServerInstance);
-               if (!ServerInstance->AddMode(nt, 'T'))
+               if (!ServerInstance->Modes->AddMode(nt))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
+       virtual void On005Numeric(std::string &output)
        {
-               List[I_OnUserPreNotice] = 1;
+               ServerInstance->AddExtBanChar('T');
        }
-       
+
        virtual int 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 (c->IsModeSet('T'))
+                       if (c->IsModeSet('T') || c->IsExtBanned(user, 'T'))
                        {
-                               if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
+                               if (ServerInstance->ULine(user->server))
                                {
-                                       // ops and halfops can still /NOTICE the channel
+                                       // ulines are exempt.
+                                       return 0;
+                               }
+                               else if (CHANOPS_EXEMPT(ServerInstance, 'T') && c->GetStatus(user) == STATUS_OP)
+                               {
+                                       // channel ops are exempt if set in conf.
                                        return 0;
                                }
                                else
                                {
-                                       user->WriteServ("404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+                                       user->WriteNumeric(ERR_CANNOTSENDTOCHAN, "%s %s :Can't send NOTICE to channel (+T set)",user->nick.c_str(), c->name.c_str());
                                        return 1;
                                }
                        }
@@ -90,10 +75,10 @@ class ModuleNoNotice : public Module
                ServerInstance->Modes->DelMode(nt);
                delete nt;
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };