Annotations

[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 bbf14865758fcf2d4d1114e73d9b2ad1522c9c4b..e81ee17a49f21363ab9e71252b9ddba2f39d10e8 100644 (file)
--- a/src/modules/m_censor.cpp
+++ b/src/modules/m_censor.cpp
@@ -21,15 +21,14 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-
 #include "inspircd.h"
 
 typedef std::map<irc::string,irc::string> censor_t;
 
 /* $ModDesc: Provides user and channel +G mode */
 
-
-
+/** Thrown by m_censor
+ */
 class CensorException : public ModuleException
 {
  public:
@@ -39,6 +38,8 @@ class CensorException : public ModuleException
        }
 };
 
+/** Handles usermode +G
+ */
 class CensorUser : public ModeHandler
 {
  public:
@@ -71,6 +72,8 @@ class CensorUser : public ModeHandler
        }
 };
 
+/** Handles channel mode +G
+ */
 class CensorChannel : public ModeHandler
 {
  public:
@@ -133,20 +136,17 @@ class ModuleCensor : public Module
 
        void Implements(char* List)
        {
-               List[I_OnRehash] = List[I_On005Numeric] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               List[I_OnRehash] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
        }
 
-
-       virtual void On005Numeric(std::string &output)
-       {
-       }
- 
        virtual ~ModuleCensor()
        {
+               ServerInstance->Modes->DelMode(cu);
+               ServerInstance->Modes->DelMode(cc);
                DELETE(cu);
                DELETE(cc);
        }
-       
+
        virtual void ReplaceLine(irc::string &text, irc::string pattern, irc::string replace)
        {
                if ((pattern != "") && (text != ""))
@@ -159,9 +159,8 @@ 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)
        {
                bool active = false;
@@ -225,7 +224,7 @@ class ModuleCensor : public Module
        virtual Version GetVersion()
        {
                // This is version 2 because version 1.x is the unreleased unrealircd module
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1,0,0,0,VF_COMMON|VF_VENDOR);
        }
        
 };