Merge pull request #569 from ShutterQuick/inspircd+asrootfix

[user/henk/code/inspircd.git] / src / modules / m_delaymsg.cpp

diff --git a/src/modules/m_delaymsg.cpp b/src/modules/m_delaymsg.cpp
index aeb4e4932057238de251df0d259d19a72b4ff7fe..15e997301aab76741a9c7079ff2bca17813f982d 100644 (file)
--- a/src/modules/m_delaymsg.cpp
+++ b/src/modules/m_delaymsg.cpp
@@ -63,7 +63,7 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
 {
        if (adding)
        {
-               if ((channel->IsModeSet('d')) && (channel->GetModeParameter('d') == parameter))
+               if ((channel->IsModeSet(this)) && (channel->GetModeParameter(this) == parameter))
                        return MODEACTION_DENY;
 
                /* Setting a new limit, sanity check */
@@ -77,7 +77,7 @@ ModeAction DelayMsgMode::OnModeChange(User* source, User* dest, Channel* channel
        }
        else
        {
-               if (!channel->IsModeSet('d'))
+               if (!channel->IsModeSet(this))
                        return MODEACTION_DENY;
 
                /*
@@ -97,7 +97,7 @@ Version ModuleDelayMsg::GetVersion()
 
 void ModuleDelayMsg::OnUserJoin(Membership* memb, bool sync, bool created, CUList&)
 {
-       if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet('d')))
+       if ((IS_LOCAL(memb->user)) && (memb->chan->IsModeSet(djm)))
        {
                djm.jointime.set(memb, ServerInstance->Time());
        }
@@ -123,7 +123,7 @@ ModResult ModuleDelayMsg::OnUserPreMessage(User* user, void* dest, int target_ty
        if (ts == 0)
                return MOD_RES_PASSTHRU;
 
-       std::string len = channel->GetModeParameter('d');
+       std::string len = channel->GetModeParameter(&djm);
 
        if (ts + atoi(len.c_str()) > ServerInstance->Time())
        {