m_spanningtree Return const references from several TreeServer getter functions

[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 e610987d335c7be75f59bdefd1b4d3464c33af14..86f307bae2ed4e494bccb87555cf75ef3f2f6e1e 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -1,19 +1,27 @@
-/*       +------------------------------------+
- *       | 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
  */
@@ -28,7 +36,7 @@ class ChannelStripColor : public SimpleChannelModeHandler
 class UserStripColor : public SimpleUserModeHandler
 {
  public:
-       UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "stripcolor", 'S') { }
+       UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { }
 };
 
 
@@ -41,8 +49,12 @@ class ModuleStripColor : public Module
  public:
        ModuleStripColor() : csc(this), usc(this)
        {
-               if (!ServerInstance->Modes->AddMode(&usc) || !ServerInstance->Modes->AddMode(&csc))
-                       throw ModuleException("Could not add new modes!");
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(usc);
+               ServerInstance->Modules->AddService(csc);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_On005Numeric };
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
@@ -60,10 +72,10 @@ class ModuleStripColor : public Module
        {
                /* 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();)
+
+               for (std::string::iterator i = sentence.begin(); i != sentence.end();)
                {
-                       if ((*i == 3))
+                       if (*i == 3)
                                seq = 1;
                        else if (seq && (( ((*i >= '0') && (*i <= '9')) || (*i == ',') ) ))
                        {
@@ -77,20 +89,7 @@ class ModuleStripColor : public Module
                                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();
-                               }
-                       }
+                               i = sentence.erase(i);
                        else
                                ++i;
                }
@@ -110,13 +109,10 @@ 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('S') && t->GetPrefixValue(user) == OP_VALUE)
-                       {
+                       if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
-                       }
 
                        active = !t->GetExtBanStatus(user, 'S').check(!t->IsModeSet('S'));
                }
@@ -136,7 +132,7 @@ class ModuleStripColor : public Module
 
        virtual Version GetVersion()
        {
-               return Version("Provides channel +S mode (strip ansi colour)", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel +S mode (strip ansi color)", VF_VENDOR);
        }
 
 };