Unite SSL service providers and SSL profile classes

[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 592aeda906407076a3262949331bd789e847abbc..8068d8b7ed5eb4f79e5d80af3b8d374272fd1665 100644 (file)
--- a/src/modules/m_stripcolor.cpp
+++ b/src/modules/m_stripcolor.cpp
@@ -20,31 +20,19 @@
 
 
 #include "inspircd.h"
-
-/** Handles channel mode +S
- */
-class ChannelStripColor : public SimpleChannelModeHandler
-{
- public:
-       ChannelStripColor(Module* Creator) : SimpleChannelModeHandler(Creator, "stripcolor", 'S') { }
-};
-
-/** Handles user mode +S
- */
-class UserStripColor : public SimpleUserModeHandler
-{
- public:
-       UserStripColor(Module* Creator) : SimpleUserModeHandler(Creator, "u_stripcolor", 'S') { }
-};
-
+#include "modules/exemption.h"
 
 class ModuleStripColor : public Module
 {
-       ChannelStripColor csc;
-       UserStripColor usc;
+       CheckExemption::EventProvider exemptionprov;
+       SimpleChannelModeHandler csc;
+       SimpleUserModeHandler usc;
 
  public:
-       ModuleStripColor() : csc(this), usc(this)
+       ModuleStripColor()
+               : exemptionprov(this)
+               , csc(this, "stripcolor", 'S')
+               , usc(this, "u_stripcolor", 'S')
        {
        }
 
@@ -67,7 +55,7 @@ class ModuleStripColor : public Module
                else if (target_type == TYPE_CHANNEL)
                {
                        Channel* t = (Channel*)dest;
-                       ModResult res = ServerInstance->OnCheckExemption(user,t,"stripcolor");
+                       ModResult res = CheckExemption::Call(exemptionprov, user, t, "stripcolor");
 
                        if (res == MOD_RES_ALLOW)
                                return MOD_RES_PASSTHRU;
@@ -91,12 +79,12 @@ class ModuleStripColor : public Module
                if (!IS_LOCAL(user))
                        return;
 
-               bool active = channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc))
-                       && ServerInstance->OnCheckExemption(user, channel, "stripcolor") != MOD_RES_ALLOW;
-
-               if (active)
+               if (channel->GetExtBanStatus(user, 'S').check(!user->IsModeSet(csc)))
                {
-                       InspIRCd::StripColor(partmessage);
+                       ModResult res = CheckExemption::Call(exemptionprov, user, channel, "stripcolor");
+
+                       if (res != MOD_RES_ALLOW)
+                               InspIRCd::StripColor(partmessage);
                }
        }