Remove unused variables detected by Clang 4.2.

[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 fa5dd17c774fa64d47dfd2b9b07d2d98fdf11f93..f1504edaf329a6bf270c4441742a7a4eddb7a8bd 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -1,26 +1,34 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2004, 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
  *
- * This program is free but copyrighted software; see
- *         the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
 
-/* $ModDesc: Provides channel +S mode (strip ansi colour) */
+/* $ModDesc: Provides channel +S mode (strip ansi color) */
 
 /** Handles channel mode +S
  */
 class ChannelStripColor : public SimpleChannelModeHandler
 {
  public:
-       ChannelStripColor(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'S') { }
+       ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { }
 };
 
 /** Handles user mode +S
@@ -28,29 +36,30 @@ class ChannelStripColor : public SimpleChannelModeHandler
 class UserStripColor : public SimpleUserModeHandler
 {
  public:
-       UserStripColor(InspIRCd* Instance, Module* Creator) : SimpleUserModeHandler(Creator, 'S') { }
+       UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { }
 };
 
 
 class ModuleStripColor : public Module
 {
-       bool AllowChanOps;
        ChannelStripColor csc;
        UserStripColor usc;
 
  public:
-       ModuleStripColor(InspIRCd* Me) : Module(Me), csc(Me, this), usc(Me, this)
+       ModuleStripColor() : csc(this), usc(this)
+       {
+       }
+
+       void init()
        {
-               if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc))
-                       throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->AddService(usc);
+               ServerInstance->Modules->AddService(csc);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual ~ModuleStripColor()
        {
-               ServerInstance->Modes->DelMode(&usc);
-               ServerInstance->Modes->DelMode(&csc);
        }
 
        virtual void On005Numeric(std::string &output)
@@ -58,46 +67,6 @@ class ModuleStripColor : public Module
                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();)
-               {
-                       if ((*i == 3))
-                               seq = 1;
-                       else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
-                       {
-                               seq++;
-                               if ( (seq <= 4) && (*i == ',') )
-                                       seq = 1;
-                               else if (seq > 3)
-                                       seq = 0;
-                       }
-                       else
-                               seq = 0;
-
-                       if (seq || ((*i == 2) || (*i == 15) || (*i == 22) || (*i == 21) || (*i == 31)))
-                       {
-                               if (i != sentence.begin())
-                               {
-                                       safei = i;
-                                       --i;
-                                       sentence.erase(safei);
-                                       ++i;
-                               }
-                               else
-                               {
-                                       sentence.erase(i);
-                                       i = sentence.begin();
-                               }
-                       }
-                       else
-                               ++i;
-               }
-       }
-
        virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
@@ -112,20 +81,17 @@ class ModuleStripColor : public Module
                else if (target_type == TYPE_CHANNEL)
                {
                        Channel* t = (Channel*)dest;
+                       ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor");
 
-                       // 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') && t->GetPrefixValue(user) == OP_VALUE)
-                       {
+                       if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
-                       }
 
                        active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
                }
 
                if (active)
                {
-                       this->ReplaceLine(text);
+                       InspIRCd::StripColor(text);
                }
 
                return MOD_RES_PASSTHRU;
@@ -138,7 +104,7 @@ class ModuleStripColor : public Module
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
        }
 
 };