Replace std::deque with std::vector in spanningtree and related modules

[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 8ed4bb49b33b9b6ee313d95b47ceb20b7583d44b..4c5e7c0282641cc018b2176746dcfe0b60ee1774 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -17,108 +17,57 @@
 
 /** Handles channel mode +S
  */
-class ChannelStripColor : public ModeHandler
+class ChannelStripColor : public SimpleChannelModeHandler
 {
  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)
-       {
-               if (adding)
-               {
-                       if (!channel->IsModeSet('S'))
-                       {
-                               channel->SetMode('S',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (channel->IsModeSet('S'))
-                       {
-                               channel->SetMode('S',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       ChannelStripColor(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'S') { }
 };
 
 /** Handles user mode +S
  */
-class UserStripColor : public ModeHandler
+class UserStripColor : public SimpleUserModeHandler
 {
  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)
-       {
-               /* Only opers can change other users modes */
-               if (source != dest)
-                       return MODEACTION_DENY;
-
-               if (adding)
-               {
-                       if (!dest->IsModeSet('S'))
-                       {
-                               dest->SetMode('S',true);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-               else
-               {
-                       if (dest->IsModeSet('S'))
-                       {
-                               dest->SetMode('S',false);
-                               return MODEACTION_ALLOW;
-                       }
-               }
-
-               return MODEACTION_DENY;
-       }
+       UserStripColor(InspIRCd* Instance) : SimpleUserModeHandler(Instance, 'S') { }
 };
 
 
 class ModuleStripColor : public Module
 {
        bool AllowChanOps;
-       ChannelStripColor *csc;
-       UserStripColor *usc;
- 
+       ChannelStripColor csc;
+       UserStripColor usc;
+
  public:
-       ModuleStripColor(InspIRCd* Me) : Module(Me)
+       ModuleStripColor(InspIRCd* Me) : Module(Me), csc(Me), usc(Me)
        {
-               usc = new UserStripColor(ServerInstance);
-               csc = new ChannelStripColor(ServerInstance);
-
-               if (!ServerInstance->AddMode(usc, 'S') || !ServerInstance->AddMode(csc, 'S'))
+               if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc))
                        throw ModuleException("Could not add new modes!");
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       void Implements(char* List)
+       virtual ~ModuleStripColor()
        {
-               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = 1;
+               ServerInstance->Modes->DelMode(&usc);
+               ServerInstance->Modes->DelMode(&csc);
        }
 
-       virtual ~ModuleStripColor()
+       virtual void On005Numeric(std::string &output)
        {
-               ServerInstance->Modes->DelMode(usc);
-               ServerInstance->Modes->DelMode(csc);
-               DELETE(usc);
-               DELETE(csc);
+               ServerInstance->AddExtBanChar('S');
        }
-       
+
        virtual void ReplaceLine(std::string &sentence)
        {
                /* refactor this completely due to SQUIT bug since the old code would strip last char and replace with \0 --peavey */
                int seq = 0;
                std::string::iterator i,safei;
-               for (i = sentence.begin(); i != sentence.end(); ++i)
+               for (i = sentence.begin(); i != sentence.end();)
                {
                        if ((*i == 3))
                                seq = 1;
-                       else if (seq && ( (*i >= '0') && (*i <= '9') || (*i == ',') ) )
+                       else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
                        {
                                seq++;
                                if ( (seq <= 4) && (*i == ',') )
@@ -128,13 +77,24 @@ class ModuleStripColor : public Module
                        }
                        else
                                seq = 0;
-                       
+
                        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);
+                                       ++i;
+                               }
+                               else
+                               {
+                                       sentence.erase(i);
+                                       i = sentence.begin();
+                               }
                        }
+                       else
+                               ++i;
                }
        }
 
@@ -155,8 +115,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') || t->GetExtBanStatus(user, 'S') < 0;
                }
 
                if (active)
@@ -166,17 +130,17 @@ class ModuleStripColor : public Module
 
                return 0;
        }
-       
+
        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 Version GetVersion()
        {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleStripColor)