Replace hardcoded mode letters passed to IsModeSet() and GetModeParameter() with...

[user/henk/code/inspircd.git] / src / modes / cmode_k.cpp

diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp
index cb9ec5b0ec4246375f9d322b97c0d0f50e57458f..e56b26ff132b4975e8355eb38a46fef303f30e80 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -32,41 +32,26 @@ ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, M
 
 ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-       bool exists = channel->IsModeSet('k');
+       bool exists = channel->IsModeSet(this);
        if (IS_LOCAL(source))
        {
                if (exists == adding)
                        return MODEACTION_DENY;
-               if (exists && (parameter != channel->GetModeParameter('k')))
+               if (exists && (parameter != channel->GetModeParameter(this)))
                {
                        /* Key is currently set and the correct key wasnt given */
                        return MODEACTION_DENY;
                }
        } else {
-               if (exists && adding && parameter == channel->GetModeParameter('k'))
+               if (exists && adding && parameter == channel->GetModeParameter(this))
                {
                        /* no-op, don't show */
                        return MODEACTION_DENY;
                }
        }
 
-       /* invalid keys */
-       if (!parameter.length())
-               return MODEACTION_DENY;
-
-       if (parameter.rfind(' ') != std::string::npos)
-               return MODEACTION_DENY;
-
        if (adding)
-       {
-               std::string ckey;
-               ckey.assign(parameter, 0, 32);
-               parameter = ckey;
-               channel->SetModeParam('k', parameter);
-       }
-       else
-       {
-               channel->SetModeParam('k', "");
-       }
+               parameter = parameter.substr(0, 32);
+
        return MODEACTION_ALLOW;
 }