Remove InspIRCd* parameters and fields

[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 5e55ce972fe751af9d3d2cf8d445548b462bdb56..4105660d11d5183a6090d334a06fe5d0e1f6f61a 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,56 +1,103 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
 #include "modes/cmode_k.h"
 
-ModeChannelKey::ModeChannelKey() : ModeHandler('k', 1, 1, false, MODETYPE_CHANNEL, false)
+ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
+{
+}
+
+ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string &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);
+    }
 }
 
-std::pair<bool,std::string> ModeChannelKey::ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
-{       
-        if (channel->modes[CM_KEY])
-        {
-                return std::make_pair(true, channel->key);
-        }
-        else
-        {
-                return std::make_pair(false, parameter);
-        }
-}       
+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(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-       if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+       bool exists = channel->IsModeSet('k');
+       if (IS_LOCAL(source))
        {
-               if (((channel->modes[CM_KEY]) && (strcasecmp(parameter.c_str(),channel->key))) && (IS_LOCAL(source)))
+               if (exists == adding)
+                       return MODEACTION_DENY;
+               if (exists && (parameter != channel->GetModeParameter('k')))
                {
                        /* Key is currently set and the correct key wasnt given */
-                       log(DEBUG,"Key Cond 2");
                        return MODEACTION_DENY;
                }
-               else if ((!channel->modes[CM_KEY]) || ((adding) && (!IS_LOCAL(source))))
+       } else {
+               if (exists && adding && parameter == channel->GetModeParameter('k'))
                {
-                       /* Key isnt currently set */
-                       strlcpy(channel->key,parameter.c_str(),32);
-                       channel->modes[CM_KEY] = adding;
-                       return MODEACTION_ALLOW;
-               }
-               else if (((channel->modes[CM_KEY]) && (!strcasecmp(parameter.c_str(),channel->key))) || ((!adding) && (!IS_LOCAL(source))))
-               {
-                       /* Key is currently set, and correct key was given */
-                       *channel->key = 0;
-                       channel->modes[CM_KEY] = adding;
-                       return MODEACTION_ALLOW;
+                       /* no-op, don't show */
+                       return MODEACTION_DENY;
                }
-               log(DEBUG,"Key Cond three");
+       }
+
+       /* 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
        {
-               log(DEBUG,"Key Condition one");
-               return MODEACTION_DENY;
+               channel->SetModeParam('k', "");
        }
+       return MODEACTION_ALLOW;
 }