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 5d62a4f89a0b6597bcee2f897708666282d8e5f6..e56b26ff132b4975e8355eb38a46fef303f30e80 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,90 +1,57 @@
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "inspircd.h"
 #include "mode.h"
 #include "channels.h"
 #include "users.h"
-#include "modes/cmode_k.h"
-
-ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', 1, 1, false, MODETYPE_CHANNEL, false)
-{
-}
-
-ModePair 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(chanrec* channel)
-{
-       /** +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()))
-       {
-               userrec* n = new userrec(ServerInstance);
-
-               sprintf(moderemove,"-%c",this->GetModeChar());
-               n->SetFd(FD_MAGIC_NUMBER);
-
-               ServerInstance->SendMode(parameters, 3, n);
-
-               delete n;
-       }
-}
+#include "builtinmodes.h"
 
-void ModeChannelKey::RemoveMode(userrec* user)
+ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
 }
 
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
-       /* When TS is equal, the alphabetically later channel key wins */
-       return (their_param < our_param);
-}
-
-ModeAction ModeChannelKey::OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
-{
-       if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source)))
+       bool exists = channel->IsModeSet(this);
+       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(this)))
                {
                        /* Key is currently set and the correct key wasnt given */
                        return MODEACTION_DENY;
                }
-               else if ((!channel->modes[CM_KEY]) || ((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;
-                               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 (exists && adding && parameter == channel->GetModeParameter(this))
                {
-                       /* 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;
                }
-               return MODEACTION_DENY;
-       }
-       else
-       {
-               return MODEACTION_DENY;
        }
-}
 
+       if (adding)
+               parameter = parameter.substr(0, 32);
+
+       return MODEACTION_ALLOW;
+}