Allow ulines to still notice the channel regardless of +T

[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 f501cc3074f6cf4232177d19ea5aac7d850e7b23..2998fff8f498274e2dc684ab511731edfa6bd9a6 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -1,8 +1,26 @@
-#include <stdio.h>
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
+ *                       E-mail:
+ *                <brain@chatspike.net>
+ *               <Craig@chatspike.net>
+ *     
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
 
+#include <stdio.h>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
+#include "helperfuncs.h"
 
 /* $ModDesc: Provides support for unreal-style channel mode +T */
 
@@ -11,20 +29,26 @@ class ModuleNoNotice : public Module
        Server *Srv;
  public:
  
-       ModuleNoNotice()
+       ModuleNoNotice(Server* Me)
+               : Module::Module(Me)
        {
-               Srv = new Server;
+               Srv = Me;
                Srv->AddExtendedMode('T',MT_CHANNEL,false,0,0);
        }
+
+       void Implements(char* List)
+       {
+               List[I_OnUserPreNotice] = List[I_On005Numeric] = List[I_OnExtendedMode] = 1;
+       }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
        {
                if (target_type == TYPE_CHANNEL)
                {
                        chanrec* c = (chanrec*)dest;
                        if (c->IsCustomModeSet('T'))
                        {
-                               if ((Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
+                               if ((Srv->IsUline(user->server)) || (Srv->ChanMode(user,c) == "@") || (Srv->ChanMode(user,c) == "%"))
                                {
                                        // ops and halfops can still /NOTICE the channel
                                        return 0;
@@ -39,6 +63,11 @@ 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...
@@ -54,12 +83,11 @@ class ModuleNoNotice : public Module
        
        virtual ~ModuleNoNotice()
        {
-               delete Srv;
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0);
+               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
        }
 };
 
@@ -75,9 +103,9 @@ class ModuleNoNoticeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleNoNotice;
+               return new ModuleNoNotice(Me);
        }
        
 };