Fix these too!

[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 01c849e5596895dd1bd692933f34b1c7c9747cee..6286321b33102c8a4e9137924383f2c2ac2cd9b0 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -5,7 +5,7 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
+ *                <Craig@chatspike.net>
  *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
@@ -16,29 +16,58 @@
 
 using namespace std;
 
-#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
+class NoNotice : public ModeHandler
+{
+ public:
+       NoNotice(InspIRCd* Instance) : ModeHandler(Instance, 'T', 0, 0, false, MODETYPE_CHANNEL, false) { }
+
+       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* 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;
+       }
+};
+
 class ModuleNoNotice : public Module
 {
-       Server *Srv;
+       
+       NoNotice* nt;
  public:
  
-       ModuleNoNotice(Server* Me)
+       ModuleNoNotice(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
+               
+               nt = new NoNotice(ServerInstance);
+               ServerInstance->AddMode(nt, 'T');
        }
 
        void Implements(char* List)
        {
-               List[I_OnUserPreNotice] = List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+               List[I_OnUserPreNotice] = 1;
        }
        
        virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status)
@@ -46,16 +75,16 @@ class ModuleNoNotice : public Module
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
-                       if (c->IsCustomModeSet('T'))
+                       if (c->IsModeSet('T'))
                        {
-                               if ((Srv->IsUlined(user->server)) || (Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+                               if ((ServerInstance->ULine(user->server)) || (c->GetStatus(user) == STATUS_OP) || (c->GetStatus(user) == STATUS_HOP))
                                {
                                        // ops and halfops can still /NOTICE the channel
                                        return 0;
                                }
                                else
                                {
-                                       WriteServ(user->fd,"404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
+                                       user->WriteServ("404 %s %s :Can't send NOTICE to channel (+T set)",user->nick, c->name);
                                        return 1;
                                }
                        }
@@ -63,31 +92,15 @@ class ModuleNoNotice : public Module
                return 0;
        }
 
-        virtual void On005Numeric(std::string &output)
-        {
-               InsertMode(output,"T",4);
-        }
-
-       virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-       {
-               // check if this is our mode character...
-               if ((modechar == 'T') && (type == MT_CHANNEL))
-               {
-                       return 1;
-               }
-               else
-               {
-                       return 0;
-               }
-       }
-       
        virtual ~ModuleNoNotice()
        {
+               ServerInstance->Modes->DelMode(nt);
+               DELETE(nt);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
        }
 };
 
@@ -103,7 +116,7 @@ class ModuleNoNoticeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleNoNotice(Me);
        }