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 b346553b6fcae80202daadc81b2359f63f813cf5..2998fff8f498274e2dc684ab511731edfa6bd9a6 100644 (file)
--- a/src/modules/m_nonotice.cpp
+++ b/src/modules/m_nonotice.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
  *               <Craig@chatspike.net>
@@ -14,10 +14,13 @@
  * ---------------------------------------------------
  */
 
+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 */
 
@@ -26,11 +29,17 @@ 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)
        {
@@ -39,7 +48,7 @@ class ModuleNoNotice : public Module
                        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;
@@ -56,21 +65,7 @@ class ModuleNoNotice : public Module
 
         virtual void On005Numeric(std::string &output)
         {
-                std::stringstream line(output);
-                std::string temp1, temp2;
-                while (!line.eof())
-                {
-                        line >> temp1;
-                        if (temp1.substr(0,10) == "CHANMODES=")
-                        {
-                                // append the chanmode to the end
-                                temp1 = temp1.substr(10,temp1.length());
-                                temp1 = "CHANMODES=" + temp1 + "T";
-                        }
-                        temp2 = temp2 + temp1 + " ";
-                }
-               if (temp2.length())
-                       output = temp2.substr(0,temp2.length()-1);
+               InsertMode(output,"T",4);
         }
 
        virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
@@ -88,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);
        }
 };
 
@@ -109,9 +103,9 @@ class ModuleNoNoticeFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule()
+       virtual Module * CreateModule(Server* Me)
        {
-               return new ModuleNoNotice;
+               return new ModuleNoNotice(Me);
        }
        
 };