m_override now has a 'requirekey' option, that requires a special key of 'override...

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

diff --git a/src/modules/m_stripcolor.cpp b/src/modules/m_stripcolor.cpp
index 6e0100b46ecdd796144a6b5a5600ade44b937b9d..9b3f8c2f1d70011a155199ecaa30b1161aa614d4 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.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
@@ -22,7 +22,7 @@ class ChannelStripColor : public ModeHandler
  public:
        ChannelStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
        {
                if (adding)
                {
@@ -52,7 +52,7 @@ class UserStripColor : public ModeHandler
  public:
        UserStripColor(InspIRCd* Instance) : ModeHandler(Instance, 'S', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool servermode)
        {
                /* Only opers can change other users modes */
                if (source != dest)
@@ -92,21 +92,19 @@ class ModuleStripColor : public Module
                usc = new UserStripColor(ServerInstance);
                csc = new ChannelStripColor(ServerInstance);
 
-               if (!ServerInstance->AddMode(usc) || !ServerInstance->AddMode(csc))
+               if (!ServerInstance->Modes->AddMode(usc) || !ServerInstance->Modes->AddMode(csc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
-       }
 
        virtual ~ModuleStripColor()
        {
                ServerInstance->Modes->DelMode(usc);
                ServerInstance->Modes->DelMode(csc);
-               DELETE(usc);
-               DELETE(csc);
+               delete usc;
+               delete csc;
        }
        
        virtual void ReplaceLine(std::string &sentence)
@@ -131,10 +129,17 @@ class ModuleStripColor : public Module
                        
                        if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
                        {
-                               safei = i;
-                               --i;
-                               sentence.erase(safei);
-                       }
+                               if (i != sentence.begin())
+                               {
+                                       safei = i;
+                                       --i;
+                                       sentence.erase(safei);
+                               }
+                               else
+                               {
+                                       sentence.erase(i);
+                                       i = sentence.begin();
+                               }                       }
                }
        }
 
@@ -155,8 +160,12 @@ class ModuleStripColor : public Module
 
                        // check if we allow ops to bypass filtering, if we do, check if they're opped accordingly.
                        // note: short circut logic here, don't wreck it. -- w00t
-                       if (!CHANOPS_EXEMPT(ServerInstance, 'S') || CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) != STATUS_OP)
-                               active = t->IsModeSet('S');
+                       if (CHANOPS_EXEMPT(ServerInstance, 'S') && t->GetStatus(user) == STATUS_OP)
+                       {
+                               return 0;
+                       }
+
+                       active = t->IsModeSet('S');
                }
 
                if (active)
@@ -174,7 +183,7 @@ class ModuleStripColor : public Module
        
        virtual Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
        
 };