Add <options:exemptchanops> support to m_censor and m_blockcaps, and tidy up the...

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

diff --git a/src/modules/m_censor.cpp b/src/modules/m_censor.cpp
index 7fea6be06e9bfe757385e4ceab7a9393455cd230..4eaf1e3b47406a4f982cd1ce9b44779c58e8cf5a 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -15,9 +15,6 @@
 #define _SCL_SECURE_NO_DEPRECATE
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
@@ -30,7 +27,7 @@ class CensorUser : public ModeHandler
  public:
        CensorUser(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -60,7 +57,7 @@ class CensorChannel : public ModeHandler
  public:
        CensorChannel(InspIRCd* Instance) : ModeHandler(Instance, 'G', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
        {
                if (adding)
                {
@@ -79,7 +76,7 @@ class CensorChannel : public ModeHandler
                        }
                }
 
-               return MODEACTION_ALLOW;
+               return MODEACTION_DENY;
        }
 };
 
@@ -100,21 +97,23 @@ class ModuleCensor : public Module
                OnRehash(NULL,"");
                cu = new CensorUser(ServerInstance);
                cc = new CensorChannel(ServerInstance);
-               if (!ServerInstance->AddMode(cu, 'G') || !ServerInstance->AddMode(cc, 'G'))
+               if (!ServerInstance->Modes->AddMode(cu) || !ServerInstance->Modes->AddMode(cc))
+               {
+                       delete cu;
+                       delete cc;
                        throw ModuleException("Could not add new modes!");
+               }
+               Implementation eventlist[] = { I_OnRehash, I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
 
        virtual ~ModuleCensor()
        {
                ServerInstance->Modes->DelMode(cu);
                ServerInstance->Modes->DelMode(cc);
-               DELETE(cu);
-               DELETE(cc);
+               delete cu;
+               delete cc;
        }
 
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
@@ -131,7 +130,7 @@ class ModuleCensor : public Module
        }
 
        // format of a config entry is <badword text="shit" replace="poo">
-       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
                        return 0;
@@ -139,9 +138,16 @@ class ModuleCensor : public Module
                bool active = false;
 
                if (target_type == TYPE_USER)
-                       active = ((userrec*)dest)->IsModeSet('G');
+                       active = ((User*)dest)->IsModeSet('G');
                else if (target_type == TYPE_CHANNEL)
-                       active = ((chanrec*)dest)->IsModeSet('G');
+               {
+                       active = ((Channel*)dest)->IsModeSet('G');
+                       Channel* c = (Channel*)dest;
+                       if (CHANOPS_EXEMPT(ServerInstance, 'G') && c->GetStatus(user) == STATUS_OP)
+                       {
+                               return 0;
+                       }
+               }
 
                if (!active)
                        return 0;
@@ -153,7 +159,7 @@ class ModuleCensor : public Module
                        {
                                if (index->second.empty())
                                {
-                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((chanrec*)dest)->name, index->first.c_str());
+                                       user->WriteServ("936 %s %s %s :Your message contained a censored word, and was blocked", user->nick, ((Channel*)dest)->name, index->first.c_str());
                                        return 1;
                                }
                                
@@ -164,12 +170,12 @@ class ModuleCensor : public Module
                return 0;
        }
        
-       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreMessage(user,dest,target_type,text,status,exempt_list);
        }
        
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user, const std::string &parameter)
        {
                /*
                 * reload our config file on rehash - we must destroy and re-allocate the classes
@@ -177,13 +183,15 @@ class ModuleCensor : public Module
                 */
                ConfigReader* MyConf = new ConfigReader(ServerInstance);
                censors.clear();
+
                for (int index = 0; index < MyConf->Enumerate("badword"); index++)
                {
                        irc::string pattern = (MyConf->ReadValue("badword","text",index)).c_str();
                        irc::string replace = (MyConf->ReadValue("badword","replace",index)).c_str();
                        censors[pattern] = replace;
                }
-               DELETE(MyConf);
+
+               delete MyConf;
        }
        
        virtual Version GetVersion()
@@ -193,4 +201,4 @@ class ModuleCensor : public Module
        
 };
 
-MODULE_INIT(ModuleCensor);
+MODULE_INIT(ModuleCensor)