Remove custom members for +lk storage

[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 194c0efcbc0a14c679cdd9421dd1d2c9f3e5e680..8e7692efccfccc203a77cfe3433aa64a8ade4b10 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -23,14 +23,15 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k',
 
 ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &parameter)
 {       
-        if (channel->modes[CM_KEY])
-        {
-                return std::make_pair(true, channel->key);
-        }
-        else
-        {
-                return std::make_pair(false, parameter);
-        }
+    if (channel->modes[CM_KEY])
+    {
+               std::string ckey = channel->GetModeParameter('k');
+               return std::make_pair(true, ckey);
+    }
+    else
+    {
+               return std::make_pair(false, parameter);
+    }
 }
 
 void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
@@ -38,17 +39,17 @@ 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
         */
-       char moderemove[MAXBUF];
-       const char* parameters[] = { channel->name, moderemove, channel->key };
 
        if (channel->IsModeSet(this->GetModeChar()))
        {
                if (stack)
-                       stack->Push(this->GetModeChar(), channel->key);
+               {
+                       stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+               }
                else
                {
-                       sprintf(moderemove,"-%c",this->GetModeChar());
-                       ServerInstance->SendMode(parameters, 3, ServerInstance->FakeClient);
+                       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);
                }
        }
 }
@@ -65,31 +66,31 @@ bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_par
 
 ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
 {
-       if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+       if ((channel->IsModeSet('k') != adding) || (!IS_LOCAL(source)))
        {
-               if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
+               if (((channel->IsModeSet('k')) && (parameter != channel->GetModeParameter('k'))) && (IS_LOCAL(source)))
                {
                        /* Key is currently set and the correct key wasnt given */
                        return MODEACTION_DENY;
                }
-               else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
+               else if ((!channel->IsModeSet('k')) || ((adding) && (!IS_LOCAL(source))))
                {
                        /* Key isnt currently set */
                        if ((parameter.length()) && (parameter.rfind(' ') == std::string::npos))
                        {
-                               strlcpy(channel->key,parameter.c_str(),32);
-                               channel->modes[CM_KEY] = adding;
-                               parameter = channel->key;
+                               std::string ckey;
+                               ckey.assign(parameter, 0, 32);
+                               channel->SetMode('k', ckey.c_str());
+                               parameter = ckey;
                                return MODEACTION_ALLOW;
                        }
                        else
                                return MODEACTION_DENY;
                }
-               else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
+               else if (((channel->IsModeSet('k')) && (parameter == channel->GetModeParameter('k'))) || ((!adding) && (!IS_LOCAL(source))))
                {
                        /* Key is currently set, and correct key was given */
-                       *channel->key = 0;
-                       channel->modes[CM_KEY] = adding;
+                       channel->SetMode('k', adding);
                        return MODEACTION_ALLOW;
                }
                return MODEACTION_DENY;