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 b2d9f34e8874f2a4ee3a11e502e2df38df389713..e56b26ff132b4975e8355eb38a46fef303f30e80 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -30,70 +30,28 @@ ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, M
 {
 }
 
-void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
-{
-       /** +k needs a parameter when being removed,
-        * so we have a special-case RemoveMode here for it
-        */
-
-       if (channel->IsModeSet('k'))
-       {
-               if (stack)
-               {
-                       stack->Push('k', channel->GetModeParameter('k'));
-               }
-               else
-               {
-                       std::vector<std::string> parameters;
-                       parameters.push_back(channel->name);
-                       parameters.push_back("-k");
-                       parameters.push_back(channel->GetModeParameter('k'));
-                       ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
-               }
-       }
-}
-
-void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
-{
-}
-
 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;
 }