Change empty string assignments to .clear() or remove them entirely

[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 f2afb9ac025e10b56620615b89ac2b5dc33a1a8c..400333fced175133e4b1cdac3e9b1e2921c9a4af 100644 (file)
--- a/src/modes/cmode_k.cpp
+++ b/src/modes/cmode_k.cpp
@@ -1,37 +1,33 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   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 program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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(User*, User*, Channel* channel, const std::string &parameter)
+ModeChannelKey::ModeChannelKey() : ModeHandler(NULL, "key", 'k', PARAM_ALWAYS, MODETYPE_CHANNEL)
 {
-    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)
@@ -61,13 +57,7 @@ void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
 {
 }
 
-bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)
-{
-       /* When TS is equal, the alphabetically later channel key wins */
-       return (their_param < our_param);
-}
-
-ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding, bool servermode)
+ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string &parameter, bool adding)
 {
        bool exists = channel->IsModeSet('k');
        if (IS_LOCAL(source))
@@ -94,20 +84,16 @@ ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, s
        if (parameter.rfind(' ') != std::string::npos)
                return MODEACTION_DENY;
 
-       /* must first unset if we are changing the key, otherwise it will be ignored */
-       if (exists && adding)
-               channel->SetMode('k', false);
-
-       /* must run setmode always, to process the change */
-       channel->SetMode('k', adding);
-
        if (adding)
        {
                std::string ckey;
                ckey.assign(parameter, 0, 32);
                parameter = ckey;
-               /* running this does not run setmode, despite the third parameter */
-               channel->SetModeParam('k', parameter.c_str(), true);
+               channel->SetModeParam('k', parameter);
+       }
+       else
+       {
+               channel->SetModeParam('k', "");
        }
        return MODEACTION_ALLOW;
 }