[Taros] Add m_sakick.so

[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 97df7f193c1682be65b2534ca9f2a4a87ec994d2..8e2b0e8d9e5d2100c894fff513341c151b40a032 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-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -17,66 +17,18 @@
 
 /** 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, bool servermode)
-       {
-               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, bool servermode)
-       {
-               /* 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') { }
 };
 
 
@@ -85,7 +37,7 @@ class ModuleStripColor : public Module
        bool AllowChanOps;
        ChannelStripColor *csc;
        UserStripColor *usc;
- 
+
  public:
        ModuleStripColor(InspIRCd* Me) : Module(Me)
        {
@@ -94,11 +46,10 @@ class ModuleStripColor : public Module
 
                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);
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-
        virtual ~ModuleStripColor()
        {
                ServerInstance->Modes->DelMode(usc);
@@ -106,7 +57,12 @@ class ModuleStripColor : public Module
                delete usc;
                delete csc;
        }
-       
+
+       virtual void On005Numeric(std::string &output)
+       {
+               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 */
@@ -116,7 +72,7 @@ class ModuleStripColor : public Module
                {
                        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 == ',') )
@@ -126,7 +82,7 @@ class ModuleStripColor : public Module
                        }
                        else
                                seq = 0;
-                       
+
                        if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
                        {
                                if (i != sentence.begin())
@@ -135,13 +91,11 @@ class ModuleStripColor : public Module
                                        --i;
                                        sentence.erase(safei);
                                        ++i;
-                                       ServerInstance->Logs->Log("m_stripcolor", DEBUG, "Sentence: %s iter pos %c", sentence.c_str(), *i);
                                }
                                else
                                {
                                        sentence.erase(i);
                                        i = sentence.begin();
-                                       ServerInstance->Logs->Log("m_stripcolor", DEBUG, "Sentence begin(): %s iter pos %c", sentence.c_str(), *i);
                                }
                        }
                        else
@@ -171,7 +125,7 @@ class ModuleStripColor : public Module
                                return 0;
                        }
 
-                       active = t->IsModeSet('S');
+                       active = t->IsModeSet('S') || t->IsExtBanned(user, 'S');
                }
 
                if (active)
@@ -181,17 +135,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, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
+
 };
 
 MODULE_INIT(ModuleStripColor)