OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

[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 cfc662aee516048ff66d6e8d24e2c819fcfb306e..69e99d0bba33306031f3ce153a5cbd6da3bcfa94 100644 (file)
--- a/src/modules/m_blockamsg.cpp
+++ b/src/modules/m_blockamsg.cpp
@@ -11,19 +11,21 @@
  * ---------------------------------------------------
  */
 
-#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. */
 
 enum BlockAction { IBLOCK_KILL, IBLOCK_KILLOPERS, IBLOCK_NOTICE, IBLOCK_NOTICEOPERS, IBLOCK_SILENT };
+/*     IBLOCK_NOTICE           - Send a notice to the user informing them of what happened.
+ *     IBLOCK_NOTICEOPERS      - Send a notice to the user informing them and send an oper notice.
+ *     IBLOCK_SILENT           - Generate no output, silently drop messages.
+ *     IBLOCK_KILL                     - Kill the user with the reason "Global message (/amsg or /ame) detected".
+ *     IBLOCK_KILLOPERS        - As above, but send an oper notice as well. This is the default.
+ */
 
 /** Holds a blocked message's details
  */
@@ -34,21 +36,23 @@ public:
        irc::string target;
        time_t sent;
 
-       BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when) : message(msg), target(tgt), sent(when)
+       BlockedMessage(const std::string &msg, const irc::string &tgt, time_t when)
+       : message(msg), target(tgt), sent(when)
        {
        }
 };
 
 class ModuleBlockAmsg : public Module
 {
-       
        int ForgetDelay;
        BlockAction action;
-public:
-       ModuleBlockAmsg(InspIRCd* Me) : Module::Module(Me)
+       
+ public:
+       ModuleBlockAmsg(InspIRCd* Me)
+       : Module(Me)
        {
                
-               this->OnRehash("");
+               this->OnRehash(NULL,"");
        }
 
        void Implements(char* List)
@@ -65,15 +69,16 @@ 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);
+               ConfigReader Conf(ServerInstance);
                
-               ForgetDelay = Conf->ReadInteger("blockamsg", "delay", 0, false);
-               if(Conf->GetError() == CONF_VALUE_NOT_FOUND)
+               ForgetDelay = Conf.ReadInteger("blockamsg", "delay", 0, false);
+               
+               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
                        ForgetDelay = -1;
                        
-               std::string act = Conf->ReadValue("blockamsg", "action", 0);
+               std::string act = Conf.ReadValue("blockamsg", "action", 0);
                
                if(act == "notice")
                        action = IBLOCK_NOTICE;
@@ -85,8 +90,6 @@ public:
                        action = IBLOCK_KILL;
                else
                        action = IBLOCK_KILLOPERS;
-
-               DELETE(Conf);
        }
 
        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
@@ -107,14 +110,25 @@ public:
                        
                        int targets = 1;
                        int userchans = 0;
-                       
-                       // Decrement if the first target wasn't a channel.
+               
                        if(*parameters[0] != '#')
+                       {
+                               // Decrement if the first target wasn't a channel.
                                targets--;
+                       }
                        
                        for(const char* c = parameters[0]; *c; c++)
                                if((*c == ',') && *(c+1) && (*(c+1) == '#'))
                                        targets++;
+                               
+                       /* targets should now contain the number of channel targets the msg/notice was pointed at.
+                        * If the msg/notice was a PM there should be no channel targets and 'targets' should = 0.
+                        * We don't want to block PMs so...
+                        */
+                       if(targets == 0)
+                       {
+                               return 0;
+                       }
                                        
                        userchans = user->chans.size();
 
@@ -174,25 +188,4 @@ public:
 };
 
 
-class ModuleBlockAmsgFactory : public ModuleFactory
-{
-       public:
-               ModuleBlockAmsgFactory()
-               {
-               }
-       
-               ~ModuleBlockAmsgFactory()
-               {
-               }
-       
-               virtual Module * CreateModule(InspIRCd* Me)
-               {
-                       return new ModuleBlockAmsg(Me);
-               }
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleBlockAmsgFactory;
-}
+MODULE_INIT(ModuleBlockAmsg)