We were already sending FMODE +nt after each channel creation to keep services happy...

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

diff --git a/src/modules/m_blockamsg.cpp b/src/modules/m_blockamsg.cpp
index 1b5fee40bfac3b1f8c6ee81fdc66585eedba65db..31c536dd527784b4700f7d62af7fc45757a54b15 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -2,30 +2,20 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *                                             <omster@gmail.com>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
- 
-/* <3's to Lauren for original info on mIRC's weird behaviour */
 
-#include <string>
-#include <time.h>
-#include "inspircd_config.h"
+#include "inspircd.h"
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "hashcomp.h"
-#include "inspircd.h"
 
 /* $ModDesc: Attempt to block /amsg, at least some of the irritating mIRC scripts. */
 
@@ -51,10 +41,10 @@ class ModuleBlockAmsg : public Module
        int ForgetDelay;
        BlockAction action;
 public:
-       ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
+       ModuleBlockAmsg(InspIRCd* Me) : Module(Me)
        {
                
-               this->OnRehash("");
+               this->OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -71,7 +61,7 @@ public:
                return Version(1,1,0,0,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ConfigReader* Conf = new ConfigReader(ServerInstance);
                
@@ -122,9 +112,7 @@ public:
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
                                        
-                       for(std::vector<ucrec*>::iterator f = user->chans.begin(); f != user->chans.end(); f++)
-                               if(((ucrec*)(*f))->channel)
-                                       userchans++;
+                       userchans = user->chans.size();
 
                        // Check that this message wasn't already sent within a few seconds.
                        BlockedMessage* m;
@@ -200,7 +188,7 @@ class ModuleBlockAmsgFactory : public ModuleFactory
 };
 
 
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
 {
        return new ModuleBlockAmsgFactory;
 }